/ Linux Cubed Series 2: Applications / Linux Cubed Series 2 - Applications.iso / editors / emacs / xemacs / xemacs-1.006 / xemacs-1 / lib / xemacs-19.13 / lisp / ediff / ediff-wind.elc

< prev

next >

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 63 74 68 6f 6d 70 40 |piled by| cthomp@|
|00000020| 77 69 6c 6c 6f 77 2e 63 | 73 2e 75 69 75 63 2e 65 |willow.c|s.uiuc.e|
|00000030| 64 75 20 6f 6e 20 54 68 | 75 20 41 75 67 20 33 31 |du on Th|u Aug 31|
|00000040| 20 31 34 3a 31 39 3a 33 | 38 20 31 39 39 35 0a 3b | 14:19:3|8 1995.;|
|00000050| 3b 3b 20 66 72 6f 6d 20 | 66 69 6c 65 20 2f 65 78 |;; from |file /ex|
|00000060| 70 6f 72 74 2f 77 69 6c | 6c 6f 77 33 2f 78 65 6d |port/wil|low3/xem|
|00000070| 61 63 73 2d 31 39 2e 31 | 33 2d 72 65 6c 65 61 73 |acs-19.1|3-releas|
|00000080| 65 2f 65 64 69 74 6f 72 | 2f 6c 69 73 70 2f 65 64 |e/editor|/lisp/ed|
|00000090| 69 66 66 2f 65 64 69 66 | 66 2d 77 69 6e 64 2e 65 |iff/edif|f-wind.e|
|000000a0| 6c 0a 3b 3b 3b 20 65 6d | 61 63 73 20 76 65 72 73 |l.;;; em|acs vers|
|000000b0| 69 6f 6e 20 31 39 2e 31 | 33 20 58 45 6d 61 63 73 |ion 19.1|3 XEmacs|
|000000c0| 20 4c 75 63 69 64 2e 0a | 3b 3b 3b 20 62 79 74 65 | Lucid..|;;; byte|
|000000d0| 63 6f 6d 70 20 76 65 72 | 73 69 6f 6e 20 32 2e 32 |comp ver|sion 2.2|
|000000e0| 35 3b 20 31 2d 53 65 70 | 2d 39 34 2e 0a 3b 3b 3b |5; 1-Sep|-94..;;;|
|000000f0| 20 6f 70 74 69 6d 69 7a | 61 74 69 6f 6e 20 69 73 | optimiz|ation is|
|00000100| 20 6f 6e 2e 0a 3b 3b 3b | 20 74 68 69 73 20 66 69 | on..;;;| this fi|
|00000110| 6c 65 20 75 73 65 73 20 | 6f 70 63 6f 64 65 73 20 |le uses |opcodes |
|00000120| 77 68 69 63 68 20 64 6f | 20 6e 6f 74 20 65 78 69 |which do| not exi|
|00000130| 73 74 20 69 6e 20 45 6d | 61 63 73 20 31 38 2e 0a |st in Em|acs 18..|
|00000140| 0a 28 69 66 20 28 61 6e | 64 20 28 62 6f 75 6e 64 |.(if (an|d (bound|
|00000150| 70 20 27 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |p 'emacs|-version|
|00000160| 29 0a 09 20 28 6f 72 20 | 28 61 6e 64 20 28 62 6f |).. (or |(and (bo|
|00000170| 75 6e 64 70 20 27 65 70 | 6f 63 68 3a 3a 76 65 72 |undp 'ep|och::ver|
|00000180| 73 69 6f 6e 29 20 65 70 | 6f 63 68 3a 3a 76 65 72 |sion) ep|och::ver|
|00000190| 73 69 6f 6e 29 0a 09 20 | 20 20 20 20 28 73 74 72 |sion).. |    (str|
|000001a0| 69 6e 67 2d 6c 65 73 73 | 70 20 65 6d 61 63 73 2d |ing-less|p emacs-|
|000001b0| 76 65 72 73 69 6f 6e 20 | 22 31 39 22 29 29 29 0a |version |"19"))).|
|000001c0| 20 20 20 20 28 65 72 72 | 6f 72 20 22 54 68 69 73 |    (err|or "This|
|000001d0| 20 66 69 6c 65 20 77 61 | 73 20 63 6f 6d 70 69 6c | file wa|s compil|
|000001e0| 65 64 20 66 6f 72 20 45 | 6d 61 63 73 20 31 39 2e |ed for E|macs 19.|
|000001f0| 22 29 29 0a 0a 28 72 65 | 71 75 69 72 65 20 27 65 |"))..(re|quire 'e|
|00000200| 64 69 66 66 2d 69 6e 69 | 74 29 0a 28 64 65 66 76 |diff-ini|t).(defv|
|00000210| 61 72 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 2d |ar ediff|-window-|
|00000220| 73 65 74 75 70 2d 66 75 | 6e 63 74 69 6f 6e 20 28 |setup-fu|nction (|
|00000230| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 20 ab 88 c0 |byte-cod|e ". ...|
|00000240| 20 c1 3e ac 82 c2 87 c3 | 87 22 20 5b 65 64 69 66 | .>.....|." [edif|
|00000250| 66 2d 64 65 76 69 63 65 | 2d 74 79 70 65 20 28 74 |f-device|-type (t|
|00000260| 74 79 20 73 74 72 65 61 | 6d 29 20 65 64 69 66 66 |ty strea|m) ediff|
|00000270| 2d 73 65 74 75 70 2d 77 | 69 6e 64 6f 77 73 2d 6d |-setup-w|indows-m|
|00000280| 75 6c 74 69 66 72 61 6d | 65 20 65 64 69 66 66 2d |ultifram|e ediff-|
|00000290| 73 65 74 75 70 2d 77 69 | 6e 64 6f 77 73 2d 70 6c |setup-wi|ndows-pl|
|000002a0| 61 69 6e 5d 20 32 29 20 | 22 5c 0a 2a 46 75 6e 63 |ain] 2) |"\.*Func|
|000002b0| 74 69 6f 6e 20 63 61 6c | 6c 65 64 20 74 6f 20 73 |tion cal|led to s|
|000002c0| 65 74 20 75 70 20 77 69 | 6e 64 6f 77 73 2e 0a 45 |et up wi|ndows..E|
|000002d0| 64 69 66 66 20 70 72 6f | 76 69 64 65 73 20 61 20 |diff pro|vides a |
|000002e0| 63 68 6f 69 63 65 20 6f | 66 20 74 77 6f 20 66 75 |choice o|f two fu|
|000002f0| 6e 63 74 69 6f 6e 73 3a | 20 65 64 69 66 66 2d 73 |nctions:| ediff-s|
|00000300| 65 74 75 70 2d 77 69 6e | 64 6f 77 73 2d 70 6c 61 |etup-win|dows-pla|
|00000310| 69 6e 2c 20 66 6f 72 0a | 64 6f 69 6e 67 20 65 76 |in, for.|doing ev|
|00000320| 65 72 79 74 68 69 6e 67 | 20 69 6e 20 6f 6e 65 20 |erything| in one |
|00000330| 66 72 61 6d 65 2c 20 61 | 6e 64 20 65 64 69 66 66 |frame, a|nd ediff|
|00000340| 2d 73 65 74 75 70 2d 77 | 69 6e 64 6f 77 73 2d 6d |-setup-w|indows-m|
|00000350| 75 6c 74 69 66 72 61 6d | 65 2c 0a 77 68 69 63 68 |ultifram|e,.which|
|00000360| 20 73 65 74 73 20 74 68 | 65 20 63 6f 6e 74 72 6f | sets th|e contro|
|00000370| 6c 20 70 61 6e 65 6c 20 | 69 6e 20 61 20 73 65 70 |l panel |in a sep|
|00000380| 61 72 61 74 65 20 66 72 | 61 6d 65 2e 20 41 6c 73 |arate fr|ame. Als|
|00000390| 6f 2c 20 69 66 20 74 68 | 65 20 6c 61 74 74 65 72 |o, if th|e latter|
|000003a0| 0a 66 75 6e 63 74 69 6f | 6e 20 64 65 74 65 63 74 |.functio|n detect|
|000003b0| 73 20 74 68 61 74 20 6f | 6e 65 20 6f 66 20 74 68 |s that o|ne of th|
|000003c0| 65 20 62 75 66 66 65 72 | 73 20 41 2f 42 20 69 73 |e buffer|s A/B is|
|000003d0| 20 73 65 65 6e 20 69 6e | 20 73 6f 6d 65 20 6f 74 | seen in| some ot|
|000003e0| 68 65 72 20 66 72 61 6d | 65 2c 0a 69 74 20 77 69 |her fram|e,.it wi|
|000003f0| 6c 6c 20 74 72 79 20 74 | 6f 20 6b 65 65 70 20 74 |ll try t|o keep t|
|00000400| 68 61 74 20 62 75 66 66 | 65 72 20 69 6e 20 74 68 |hat buff|er in th|
|00000410| 61 74 20 66 72 61 6d 65 | 2e 0a 0a 49 66 20 79 6f |at frame|...If yo|
|00000420| 75 20 64 6f 6e 27 74 20 | 6c 69 6b 65 20 74 68 65 |u don't |like the|
|00000430| 20 74 77 6f 20 66 75 6e | 63 74 69 6f 6e 73 20 70 | two fun|ctions p|
|00000440| 72 6f 76 69 64 65 64 2d | 2d 2d 77 72 69 74 65 20 |rovided-|--write |
|00000450| 79 6f 75 72 20 6f 77 6e | 20 6f 6e 65 2e 0a 54 68 |your own| one..Th|
|00000460| 65 20 62 61 73 69 63 20 | 67 75 69 64 65 6c 69 6e |e basic |guidelin|
|00000470| 65 73 3a 0a 20 20 20 20 | 31 2e 20 49 74 20 73 68 |es:.    |1. It sh|
|00000480| 6f 75 6c 64 20 6c 65 61 | 76 65 20 74 68 65 20 63 |ould lea|ve the c|
|00000490| 6f 6e 74 72 6f 6c 20 62 | 75 66 66 65 72 20 63 75 |ontrol b|uffer cu|
|000004a0| 72 72 65 6e 74 20 61 6e | 64 20 74 68 65 20 63 6f |rrent an|d the co|
|000004b0| 6e 74 72 6f 6c 20 77 69 | 6e 64 6f 77 0a 20 20 20 |ntrol wi|ndow.   |
|000004c0| 20 20 20 20 73 65 6c 65 | 63 74 65 64 2e 20 0a 20 |    sele|cted. . |
|000004d0| 20 20 20 32 2e 20 49 74 | 20 73 68 6f 75 6c 64 20 |   2. It| should |
|000004e0| 73 65 74 20 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |set edif|f-window|
|000004f0| 2d 41 2c 20 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |-A, edif|f-window|
|00000500| 2d 42 2c 20 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |-B, edif|f-window|
|00000510| 2d 43 2c 0a 20 20 20 20 | 20 20 20 61 6e 64 20 65 |-C,.    |   and e|
|00000520| 64 69 66 66 2d 63 6f 6e | 74 72 6f 6c 2d 77 69 6e |diff-con|trol-win|
|00000530| 64 6f 77 20 74 6f 20 63 | 6f 6e 74 61 69 6e 20 77 |dow to c|ontain w|
|00000540| 69 6e 64 6f 77 20 6f 62 | 6a 65 63 74 73 20 74 68 |indow ob|jects th|
|00000550| 61 74 20 64 69 73 70 6c | 61 79 0a 20 20 20 20 20 |at displ|ay.     |
|00000560| 20 20 74 68 65 20 63 6f | 72 72 65 73 70 6f 6e 64 |  the co|rrespond|
|00000570| 69 6e 67 20 62 75 66 66 | 65 72 73 2e 0a 20 20 20 |ing buff|ers..   |
|00000580| 20 33 2e 20 49 74 20 73 | 68 6f 75 6c 64 20 61 63 | 3. It s|hould ac|
|00000590| 63 65 70 74 20 74 68 65 | 20 66 6f 6c 6c 6f 77 69 |cept the| followi|
|000005a0| 6e 67 20 61 72 67 75 6d | 65 6e 74 73 3a 0a 20 20 |ng argum|ents:.  |
|000005b0| 20 20 20 20 20 62 75 66 | 66 65 72 2d 41 2c 20 62 |     buf|fer-A, b|
|000005c0| 75 66 66 65 72 2d 42 2c | 20 62 75 66 66 65 72 2d |uffer-B,| buffer-|
|000005d0| 43 2c 20 63 6f 6e 74 72 | 6f 6c 2d 62 75 66 66 65 |C, contr|ol-buffe|
|000005e0| 72 0a 20 20 20 20 20 20 | 20 42 75 66 66 65 72 20 |r.      | Buffer |
|000005f0| 43 20 6d 61 79 20 6e 6f | 74 20 62 65 20 75 73 65 |C may no|t be use|
|00000600| 64 20 69 6e 20 6a 6f 62 | 73 20 74 68 61 74 20 63 |d in job|s that c|
|00000610| 6f 6d 70 61 72 65 20 6f | 6e 6c 79 20 74 77 6f 20 |ompare o|nly two |
|00000620| 62 75 66 66 65 72 73 2e | 0a 49 66 20 79 6f 75 20 |buffers.|.If you |
|00000630| 70 6c 61 6e 20 74 6f 20 | 64 6f 20 73 6f 6d 65 74 |plan to |do somet|
|00000640| 68 69 6e 67 20 66 61 6e | 63 79 2c 20 74 61 6b 65 |hing fan|cy, take|
|00000650| 20 61 20 63 6c 6f 73 65 | 20 6c 6f 6f 6b 20 61 74 | a close| look at|
|00000660| 20 68 6f 77 20 74 68 65 | 20 74 77 6f 0a 70 72 6f | how the| two.pro|
|00000670| 76 69 64 65 64 20 66 75 | 6e 63 74 69 6f 6e 73 20 |vided fu|nctions |
|00000680| 61 72 65 20 77 72 69 74 | 74 65 6e 2e 22 29 0a 28 |are writ|ten.").(|
|00000690| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 6d 75 6c |defvar e|diff-mul|
|000006a0| 74 69 66 72 61 6d 65 20 | 6e 69 6c 20 22 5c 0a 22 |tiframe |nil "\."|
|000006b0| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|000006c0| 21 88 c2 c1 c3 c4 23 87 | 22 20 5b 6d 61 6b 65 2d |!.....#.|" [make-|
|000006d0| 76 61 72 69 61 62 6c 65 | 2d 62 75 66 66 65 72 2d |variable|-buffer-|
|000006e0| 6c 6f 63 61 6c 20 65 64 | 69 66 66 2d 6d 75 6c 74 |local ed|iff-mult|
|000006f0| 69 66 72 61 6d 65 20 70 | 75 74 20 70 65 72 6d 61 |iframe p|ut perma|
|00000700| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 74 5d 20 34 29 |nent-loc|al t] 4)|
|00000710| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 6d |.(defvar| ediff-m|
|00000720| 65 72 67 65 2d 77 69 6e | 64 6f 77 2d 73 68 61 72 |erge-win|dow-shar|
|00000730| 65 20 30 2e 34 35 20 22 | 5c 0a 22 29 0a 28 62 79 |e 0.45 "|\.").(by|
|00000740| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|00000750| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00000760| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00000770| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 77 69 6e | ediff-m|erge-win|
|00000780| 64 6f 77 2d 73 68 61 72 | 65 20 70 75 74 20 70 65 |dow-shar|e put pe|
|00000790| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 74 5d |rmanent-|local t]|
|000007a0| 20 34 29 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 | 4).(def|var edif|
|000007b0| 66 2d 63 6f 6e 74 72 6f | 6c 2d 77 69 6e 64 6f 77 |f-contro|l-window|
|000007c0| 20 6e 69 6c 20 22 5c 0a | 22 29 0a 28 62 79 74 65 | nil "\.|").(byte|
|000007d0| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|000007e0| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|000007f0| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00000800| 64 69 66 66 2d 63 6f 6e | 74 72 6f 6c 2d 77 69 6e |diff-con|trol-win|
|00000810| 64 6f 77 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |dow put |permanen|
|00000820| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 28 64 |t-local |t] 4).(d|
|00000830| 65 66 76 61 72 20 65 64 | 69 66 66 2d 77 69 6e 64 |efvar ed|iff-wind|
|00000840| 6f 77 2d 41 20 6e 69 6c | 20 22 5c 0a 22 29 0a 28 |ow-A nil| "\.").(|
|00000850| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00000860| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00000870| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00000880| 61 6c 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 2d |al ediff|-window-|
|00000890| 41 20 70 75 74 20 70 65 | 72 6d 61 6e 65 6e 74 2d |A put pe|rmanent-|
|000008a0| 6c 6f 63 61 6c 20 74 5d | 20 34 29 0a 28 64 65 66 |local t]| 4).(def|
|000008b0| 76 61 72 20 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |var edif|f-window|
|000008c0| 2d 42 20 6e 69 6c 20 22 | 5c 0a 22 29 0a 28 62 79 |-B nil "|\.").(by|
|000008d0| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|000008e0| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|000008f0| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00000900| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 2d 42 20 | ediff-w|indow-B |
|00000910| 70 75 74 20 70 65 72 6d | 61 6e 65 6e 74 2d 6c 6f |put perm|anent-lo|
|00000920| 63 61 6c 20 74 5d 20 34 | 29 0a 28 64 65 66 76 61 |cal t] 4|).(defva|
|00000930| 72 20 65 64 69 66 66 2d | 77 69 6e 64 6f 77 2d 43 |r ediff-|window-C|
|00000940| 20 6e 69 6c 20 22 5c 0a | 22 29 0a 28 62 79 74 65 | nil "\.|").(byte|
|00000950| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|00000960| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00000970| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00000980| 64 69 66 66 2d 77 69 6e | 64 6f 77 2d 43 20 70 75 |diff-win|dow-C pu|
|00000990| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|000009a0| 6c 20 74 5d 20 34 29 0a | 28 64 65 66 76 61 72 20 |l t] 4).|(defvar |
|000009b0| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 2d 63 6f 6e |ediff-wi|ndow-con|
|000009c0| 66 69 67 2d 73 61 76 65 | 64 20 22 22 20 22 5c 0a |fig-save|d "" "\.|
|000009d0| 22 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |").(byte|-code ".|
|000009e0| c1 21 88 c2 c1 c3 c4 23 | 87 22 20 5b 6d 61 6b 65 |.!.....#|." [make|
|000009f0| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00000a00| 2d 6c 6f 63 61 6c 20 65 | 64 69 66 66 2d 77 69 6e |-local e|diff-win|
|00000a10| 64 6f 77 2d 63 6f 6e 66 | 69 67 2d 73 61 76 65 64 |dow-conf|ig-saved|
|00000a20| 20 70 75 74 20 70 65 72 | 6d 61 6e 65 6e 74 2d 6c | put per|manent-l|
|00000a30| 6f 63 61 6c 20 74 5d 20 | 34 29 0a 28 64 65 66 76 |ocal t] |4).(defv|
|00000a40| 61 72 20 65 64 69 66 66 | 2d 73 70 6c 69 74 2d 77 |ar ediff|-split-w|
|00000a50| 69 6e 64 6f 77 2d 66 75 | 6e 63 74 69 6f 6e 20 27 |indow-fu|nction '|
|00000a60| 73 70 6c 69 74 2d 77 69 | 6e 64 6f 77 2d 76 65 72 |split-wi|ndow-ver|
|00000a70| 74 69 63 61 6c 6c 79 20 | 22 5c 0a 2a 54 68 65 20 |tically |"\.*The |
|00000a80| 66 75 6e 63 74 69 6f 6e | 20 75 73 65 64 20 74 6f |function| used to|
|00000a90| 20 73 70 6c 69 74 20 74 | 68 65 20 6d 61 69 6e 20 | split t|he main |
|00000aa0| 77 69 6e 64 6f 77 20 62 | 65 74 77 65 65 6e 20 62 |window b|etween b|
|00000ab0| 75 66 66 65 72 2d 41 20 | 61 6e 64 20 62 75 66 66 |uffer-A |and buff|
|00000ac0| 65 72 2d 42 2e 0a 59 6f | 75 20 63 61 6e 20 73 65 |er-B..Yo|u can se|
|00000ad0| 74 20 69 74 20 74 6f 20 | 61 20 68 6f 72 69 7a 6f |t it to |a horizo|
|00000ae0| 6e 74 61 6c 20 73 70 6c | 69 74 20 69 6e 73 74 65 |ntal spl|it inste|
|00000af0| 61 64 20 6f 66 20 74 68 | 65 20 64 65 66 61 75 6c |ad of th|e defaul|
|00000b00| 74 20 76 65 72 74 69 63 | 61 6c 20 73 70 6c 69 74 |t vertic|al split|
|00000b10| 0a 62 79 20 73 65 74 74 | 69 6e 67 20 74 68 69 73 |.by sett|ing this|
|00000b20| 20 76 61 72 69 61 62 6c | 65 20 74 6f 20 60 73 70 | variabl|e to `sp|
|00000b30| 6c 69 74 2d 77 69 6e 64 | 6f 77 2d 68 6f 72 69 7a |lit-wind|ow-horiz|
|00000b40| 6f 6e 74 61 6c 6c 79 27 | 2e 0a 59 6f 75 20 63 61 |ontally'|..You ca|
|00000b50| 6e 20 61 6c 73 6f 20 68 | 61 76 65 20 79 6f 75 72 |n also h|ave your|
|00000b60| 20 6f 77 6e 20 66 75 6e | 63 74 69 6f 6e 20 74 6f | own fun|ction to|
|00000b70| 20 64 6f 20 66 61 6e 63 | 79 20 73 70 6c 69 74 73 | do fanc|y splits|
|00000b80| 2e 0a 54 68 69 73 20 76 | 61 72 69 61 62 6c 65 20 |..This v|ariable |
|00000b90| 68 61 73 20 6e 6f 20 65 | 66 66 65 63 74 20 77 68 |has no e|ffect wh|
|00000ba0| 65 6e 20 62 75 66 66 65 | 72 2d 41 2f 42 20 61 72 |en buffe|r-A/B ar|
|00000bb0| 65 20 73 68 6f 77 6e 20 | 69 6e 20 64 69 66 66 65 |e shown |in diffe|
|00000bc0| 72 65 6e 74 20 66 72 61 | 6d 65 73 2e 0a 49 6e 20 |rent fra|mes..In |
|00000bd0| 74 68 69 73 20 63 61 73 | 65 2c 20 45 64 69 66 66 |this cas|e, Ediff|
|00000be0| 20 77 69 6c 6c 20 75 73 | 65 20 74 68 6f 73 65 20 | will us|e those |
|00000bf0| 66 72 61 6d 65 73 20 74 | 6f 20 64 69 73 70 6c 61 |frames t|o displa|
|00000c00| 79 20 74 68 65 73 65 20 | 62 75 66 66 65 72 73 2e |y these |buffers.|
|00000c10| 22 29 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |").(defv|ar ediff|
|00000c20| 2d 6d 65 72 67 65 2d 73 | 70 6c 69 74 2d 77 69 6e |-merge-s|plit-win|
|00000c30| 64 6f 77 2d 66 75 6e 63 | 74 69 6f 6e 20 27 73 70 |dow-func|tion 'sp|
|00000c40| 6c 69 74 2d 77 69 6e 64 | 6f 77 2d 68 6f 72 69 7a |lit-wind|ow-horiz|
|00000c50| 6f 6e 74 61 6c 6c 79 20 | 22 5c 0a 2a 54 68 65 20 |ontally |"\.*The |
|00000c60| 66 75 6e 63 74 69 6f 6e | 20 75 73 65 64 20 74 6f |function| used to|
|00000c70| 20 73 70 6c 69 74 20 74 | 68 65 20 6d 61 69 6e 20 | split t|he main |
|00000c80| 77 69 6e 64 6f 77 20 62 | 65 74 77 65 65 6e 20 62 |window b|etween b|
|00000c90| 75 66 66 65 72 2d 41 20 | 61 6e 64 20 62 75 66 66 |uffer-A |and buff|
|00000ca0| 65 72 2d 42 2e 0a 59 6f | 75 20 63 61 6e 20 73 65 |er-B..Yo|u can se|
|00000cb0| 74 20 69 74 20 74 6f 20 | 61 20 76 65 72 74 69 63 |t it to |a vertic|
|00000cc0| 61 6c 20 73 70 6c 69 74 | 20 69 6e 73 74 65 61 64 |al split| instead|
|00000cd0| 20 6f 66 20 74 68 65 20 | 64 65 66 61 75 6c 74 20 | of the |default |
|00000ce0| 68 6f 72 69 7a 6f 6e 74 | 61 6c 20 73 70 6c 69 74 |horizont|al split|
|00000cf0| 0a 62 79 20 73 65 74 74 | 69 6e 67 20 74 68 69 73 |.by sett|ing this|
|00000d00| 20 76 61 72 69 61 62 6c | 65 20 74 6f 20 60 73 70 | variabl|e to `sp|
|00000d10| 6c 69 74 2d 77 69 6e 64 | 6f 77 2d 76 65 72 74 69 |lit-wind|ow-verti|
|00000d20| 63 61 6c 6c 79 27 2e 0a | 59 6f 75 20 63 61 6e 20 |cally'..|You can |
|00000d30| 61 6c 73 6f 20 68 61 76 | 65 20 79 6f 75 72 20 6f |also hav|e your o|
|00000d40| 77 6e 20 66 75 6e 63 74 | 69 6f 6e 20 74 6f 20 64 |wn funct|ion to d|
|00000d50| 6f 20 66 61 6e 63 79 20 | 73 70 6c 69 74 73 2e 0a |o fancy |splits..|
|00000d60| 54 68 69 73 20 76 61 72 | 69 61 62 6c 65 20 68 61 |This var|iable ha|
|00000d70| 73 20 6e 6f 20 65 66 66 | 65 63 74 20 77 68 65 6e |s no eff|ect when|
|00000d80| 20 62 75 66 66 65 72 2d | 41 2f 42 2f 43 20 61 72 | buffer-|A/B/C ar|
|00000d90| 65 20 73 68 6f 77 6e 20 | 69 6e 20 64 69 66 66 65 |e shown |in diffe|
|00000da0| 72 65 6e 74 20 66 72 61 | 6d 65 73 2e 0a 49 6e 20 |rent fra|mes..In |
|00000db0| 74 68 69 73 20 63 61 73 | 65 2c 20 45 64 69 66 66 |this cas|e, Ediff|
|00000dc0| 20 77 69 6c 6c 20 75 73 | 65 20 74 68 6f 73 65 20 | will us|e those |
|00000dd0| 66 72 61 6d 65 73 20 74 | 6f 20 64 69 73 70 6c 61 |frames t|o displa|
|00000de0| 79 20 74 68 65 73 65 20 | 62 75 66 66 65 72 73 2e |y these |buffers.|
|00000df0| 22 29 0a 28 64 65 66 63 | 6f 6e 73 74 20 65 64 69 |").(defc|onst edi|
|00000e00| 66 66 2d 63 6f 6e 74 72 | 6f 6c 2d 66 72 61 6d 65 |ff-contr|ol-frame|
|00000e10| 2d 70 61 72 61 6d 65 74 | 65 72 73 20 28 62 79 74 |-paramet|ers (byt|
|00000e20| 65 2d 63 6f 64 65 20 22 | c0 20 ad ac c0 20 c1 3e |e-code "|. ... .>|
|00000e30| 3f ad a5 c2 c3 c4 c5 c6 | c7 c8 c9 ca cb cc cd 21 |?.......|.......!|
|00000e40| ab 85 cd 20 54 aa 81 ce | 42 cf cc d0 21 ab 85 d0 |... T...|B...!...|
|00000e50| 20 54 aa 81 ce 42 af 0b | 87 22 20 5b 65 64 69 66 | T...B..|." [edif|
|00000e60| 66 2d 64 65 76 69 63 65 | 2d 74 79 70 65 20 28 74 |f-device|-type (t|
|00000e70| 74 79 20 73 74 72 65 61 | 6d 29 20 28 6e 61 6d 65 |ty strea|m) (name|
|00000e80| 20 2e 20 22 45 64 69 66 | 66 22 29 20 28 6d 69 6e | . "Edif|f") (min|
|00000e90| 69 62 75 66 66 65 72 29 | 20 28 75 73 65 72 2d 70 |ibuffer)| (user-p|
|00000ea0| 6f 73 69 74 69 6f 6e 20 | 2e 20 74 29 20 28 76 65 |osition |. t) (ve|
|00000eb0| 72 74 69 63 61 6c 2d 73 | 63 72 6f 6c 6c 2d 62 61 |rtical-s|croll-ba|
|00000ec0| 72 73 29 20 28 73 63 72 | 6f 6c 6c 62 61 72 2d 77 |rs) (scr|ollbar-w|
|00000ed0| 69 64 74 68 20 2e 20 30 | 29 20 28 6d 65 6e 75 2d |idth . 0|) (menu-|
|00000ee0| 62 61 72 2d 6c 69 6e 65 | 73 20 2e 20 30 29 20 28 |bar-line|s . 0) (|
|00000ef0| 76 69 73 69 62 69 6c 69 | 74 79 29 20 28 61 75 74 |visibili|ty) (aut|
|00000f00| 6f 2d 6c 6f 77 65 72 29 | 20 28 61 75 74 6f 2d 72 |o-lower)| (auto-r|
|00000f10| 61 69 73 65 20 2e 20 74 | 29 20 74 6f 70 20 66 62 |aise . t|) top fb|
|00000f20| 6f 75 6e 64 70 20 65 64 | 69 66 66 2d 64 69 73 70 |oundp ed|iff-disp|
|00000f30| 6c 61 79 2d 70 69 78 65 | 6c 2d 68 65 69 67 68 74 |lay-pixe|l-height|
|00000f40| 20 33 30 30 30 20 6c 65 | 66 74 20 65 64 69 66 66 | 3000 le|ft ediff|
|00000f50| 2d 64 69 73 70 6c 61 79 | 2d 70 69 78 65 6c 2d 77 |-display|-pixel-w|
|00000f60| 69 64 74 68 5d 20 31 33 | 29 20 22 5c 0a 46 72 61 |idth] 13|) "\.Fra|
|00000f70| 6d 65 20 70 61 72 61 6d | 65 74 65 72 73 20 66 6f |me param|eters fo|
|00000f80| 72 20 64 69 73 70 6c 61 | 79 69 6e 67 20 45 64 69 |r displa|ying Edi|
|00000f90| 66 66 20 43 6f 6e 74 72 | 6f 6c 20 50 61 6e 65 6c |ff Contr|ol Panel|
|00000fa0| 2e 0a 44 6f 20 6e 6f 74 | 20 73 70 65 63 69 66 79 |..Do not| specify|
|00000fb0| 20 77 69 64 74 68 20 61 | 6e 64 20 68 65 69 67 68 | width a|nd heigh|
|00000fc0| 74 20 68 65 72 65 2e 20 | 54 68 65 73 65 20 61 72 |t here. |These ar|
|00000fd0| 65 20 63 6f 6d 70 75 74 | 65 64 20 61 75 74 6f 6d |e comput|ed autom|
|00000fe0| 61 74 69 63 61 6c 6c 79 | 2e 22 29 0a 28 64 65 66 |atically|.").(def|
|00000ff0| 76 61 72 20 65 64 69 66 | 66 2d 63 6f 6e 74 72 6f |var edif|f-contro|
|00001000| 6c 2d 66 72 61 6d 65 2d | 70 6f 73 69 74 69 6f 6e |l-frame-|position|
|00001010| 2d 66 75 6e 63 74 69 6f | 6e 20 27 65 64 69 66 66 |-functio|n 'ediff|
|00001020| 2d 6d 61 6b 65 2d 66 72 | 61 6d 65 2d 70 6f 73 69 |-make-fr|ame-posi|
|00001030| 74 69 6f 6e 20 22 5c 0a | 46 75 6e 63 74 69 6f 6e |tion "\.|Function|
|00001040| 20 74 6f 20 63 61 6c 6c | 20 74 6f 20 64 65 74 65 | to call| to dete|
|00001050| 72 6d 69 6e 65 20 74 68 | 65 20 64 65 73 69 72 65 |rmine th|e desire|
|00001060| 64 20 6c 6f 63 61 74 69 | 6f 6e 20 66 6f 72 20 74 |d locati|on for t|
|00001070| 68 65 20 63 6f 6e 74 72 | 6f 6c 20 70 61 6e 65 6c |he contr|ol panel|
|00001080| 2e 0a 45 78 70 65 63 74 | 73 20 74 68 72 65 65 20 |..Expect|s three |
|00001090| 70 61 72 61 6d 65 74 65 | 72 73 3a 20 74 68 65 20 |paramete|rs: the |
|000010a0| 63 6f 6e 74 72 6f 6c 20 | 62 75 66 66 65 72 2c 20 |control |buffer, |
|000010b0| 74 68 65 20 64 65 73 69 | 72 65 64 20 77 69 64 74 |the desi|red widt|
|000010c0| 68 20 61 6e 64 20 68 65 | 69 67 68 74 0a 6f 66 20 |h and he|ight.of |
|000010d0| 74 68 65 20 63 6f 6e 74 | 72 6f 6c 20 66 72 61 6d |the cont|rol fram|
|000010e0| 65 2e 20 49 74 20 72 65 | 74 75 72 6e 73 20 61 6e |e. It re|turns an|
|000010f0| 20 61 73 73 6f 63 69 61 | 74 69 6f 6e 20 6c 69 73 | associa|tion lis|
|00001100| 74 0a 6f 66 20 74 68 65 | 20 66 6f 72 6d 20 28 28 |t.of the| form ((|
|00001110| 74 6f 70 20 2e 20 3c 70 | 6f 73 69 74 69 6f 6e 3e |top . <p|osition>|
|00001120| 29 20 28 6c 65 66 74 20 | 2e 20 3c 70 6f 73 69 74 |) (left |. <posit|
|00001130| 69 6f 6e 3e 29 29 22 29 | 0a 28 64 65 66 76 61 72 |ion>))")|.(defvar|
|00001140| 20 65 64 69 66 66 2d 63 | 6f 6e 74 72 6f 6c 2d 66 | ediff-c|ontrol-f|
|00001150| 72 61 6d 65 2d 75 70 77 | 61 72 64 2d 73 68 69 66 |rame-upw|ard-shif|
|00001160| 74 20 28 62 79 74 65 2d | 63 6f 64 65 20 22 08 ab |t (byte-|code "..|
|00001170| 82 c1 87 c2 87 22 20 5b | 65 64 69 66 66 2d 78 65 |....." [|ediff-xe|
|00001180| 6d 61 63 73 2d 70 20 33 | 36 20 34 5d 20 31 29 20 |macs-p 3|6 4] 1) |
|00001190| 22 5c 0a 2a 54 68 65 20 | 75 70 77 61 72 64 20 73 |"\.*The |upward s|
|000011a0| 68 69 66 74 20 6f 66 20 | 63 6f 6e 74 72 6f 6c 20 |hift of |control |
|000011b0| 66 72 61 6d 65 20 66 72 | 6f 6d 20 74 68 65 20 74 |frame fr|om the t|
|000011c0| 6f 70 20 6f 66 20 62 75 | 66 66 65 72 20 41 27 73 |op of bu|ffer A's|
|000011d0| 20 66 72 61 6d 65 2e 0a | 4d 65 61 73 75 72 65 64 | frame..|Measured|
|000011e0| 20 69 6e 20 70 69 78 65 | 6c 73 2e 0a 54 68 69 73 | in pixe|ls..This|
|000011f0| 20 69 73 20 75 73 65 64 | 20 62 79 20 74 68 65 20 | is used| by the |
|00001200| 64 65 66 61 75 6c 74 20 | 63 6f 6e 74 72 6f 6c 20 |default |control |
|00001210| 66 72 61 6d 65 20 70 6f | 73 69 74 69 6f 6e 69 6e |frame po|sitionin|
|00001220| 67 20 66 75 6e 63 74 69 | 6f 6e 2c 0a 60 65 64 69 |g functi|on,.`edi|
|00001230| 66 66 2d 6d 61 6b 65 2d | 66 72 61 6d 65 2d 70 6f |ff-make-|frame-po|
|00001240| 73 69 74 69 6f 6e 27 2e | 20 54 68 69 73 20 76 61 |sition'.| This va|
|00001250| 72 69 61 62 6c 65 20 69 | 73 20 70 72 6f 76 69 64 |riable i|s provid|
|00001260| 65 64 20 66 6f 72 20 65 | 61 73 79 0a 63 75 73 74 |ed for e|asy.cust|
|00001270| 6f 6d 69 7a 61 74 69 6f | 6e 20 6f 66 20 74 68 65 |omizatio|n of the|
|00001280| 20 64 65 66 61 75 6c 74 | 2e 22 29 0a 28 64 65 66 | default|.").(def|
|00001290| 76 61 72 20 65 64 69 66 | 66 2d 6e 61 72 72 6f 77 |var edif|f-narrow|
|000012a0| 2d 63 6f 6e 74 72 6f 6c | 2d 66 72 61 6d 65 2d 6c |-control|-frame-l|
|000012b0| 65 66 74 77 61 72 64 2d | 73 68 69 66 74 20 28 62 |eftward-|shift (b|
|000012c0| 79 74 65 2d 63 6f 64 65 | 20 22 08 ab 82 c1 87 c2 |yte-code| "......|
|000012d0| 87 22 20 5b 65 64 69 66 | 66 2d 78 65 6d 61 63 73 |." [edif|f-xemacs|
|000012e0| 2d 70 20 37 20 33 5d 20 | 31 29 20 22 5c 0a 2a 54 |-p 7 3] |1) "\.*T|
|000012f0| 68 65 20 6c 65 66 74 77 | 61 72 64 20 73 68 69 66 |he leftw|ard shif|
|00001300| 74 20 6f 66 20 63 6f 6e | 74 72 6f 6c 20 66 72 61 |t of con|trol fra|
|00001310| 6d 65 20 66 72 6f 6d 20 | 74 68 65 20 72 69 67 68 |me from |the righ|
|00001320| 74 20 65 64 67 65 20 6f | 66 20 62 75 66 20 41 27 |t edge o|f buf A'|
|00001330| 73 20 66 72 61 6d 65 2e | 0a 4d 65 61 73 75 72 65 |s frame.|.Measure|
|00001340| 64 20 69 6e 20 63 68 61 | 72 61 63 74 65 72 73 2e |d in cha|racters.|
|00001350| 0a 54 68 69 73 20 69 73 | 20 75 73 65 64 20 62 79 |.This is| used by|
|00001360| 20 74 68 65 20 64 65 66 | 61 75 6c 74 20 63 6f 6e | the def|ault con|
|00001370| 74 72 6f 6c 20 66 72 61 | 6d 65 20 70 6f 73 69 74 |trol fra|me posit|
|00001380| 69 6f 6e 69 6e 67 20 66 | 75 6e 63 74 69 6f 6e 2c |ioning f|unction,|
|00001390| 0a 60 65 64 69 66 66 2d | 6d 61 6b 65 2d 66 72 61 |.`ediff-|make-fra|
|000013a0| 6d 65 2d 70 6f 73 69 74 | 69 6f 6e 27 20 74 6f 20 |me-posit|ion' to |
|000013b0| 61 64 6a 75 73 74 20 74 | 68 65 20 70 6f 73 69 74 |adjust t|he posit|
|000013c0| 69 6f 6e 20 6f 66 20 74 | 68 65 20 63 6f 6e 74 72 |ion of t|he contr|
|000013d0| 6f 6c 20 66 72 61 6d 65 | 0a 77 68 65 6e 20 69 74 |ol frame|.when it|
|000013e0| 20 73 68 6f 77 73 20 74 | 68 65 20 73 68 6f 72 74 | shows t|he short|
|000013f0| 20 6d 65 6e 75 2e 20 54 | 68 69 73 20 76 61 72 69 | menu. T|his vari|
|00001400| 61 62 6c 65 20 69 73 20 | 70 72 6f 76 69 64 65 64 |able is |provided|
|00001410| 20 66 6f 72 20 65 61 73 | 79 0a 63 75 73 74 6f 6d | for eas|y.custom|
|00001420| 69 7a 61 74 69 6f 6e 20 | 6f 66 20 74 68 65 20 64 |ization |of the d|
|00001430| 65 66 61 75 6c 74 2e 22 | 29 0a 28 64 65 66 76 61 |efault."|).(defva|
|00001440| 72 20 65 64 69 66 66 2d | 77 69 64 65 2d 63 6f 6e |r ediff-|wide-con|
|00001450| 74 72 6f 6c 2d 66 72 61 | 6d 65 2d 72 69 67 68 74 |trol-fra|me-right|
|00001460| 77 61 72 64 2d 73 68 69 | 66 74 20 37 20 22 5c 0a |ward-shi|ft 7 "\.|
|00001470| 2a 54 68 65 20 72 69 67 | 68 74 77 61 72 64 20 73 |*The rig|htward s|
|00001480| 68 69 66 74 20 6f 66 20 | 63 6f 6e 74 72 6f 6c 20 |hift of |control |
|00001490| 66 72 61 6d 65 20 66 72 | 6f 6d 20 74 68 65 20 6c |frame fr|om the l|
|000014a0| 65 66 74 20 65 64 67 65 | 20 6f 66 20 62 75 66 20 |eft edge| of buf |
|000014b0| 41 27 73 20 66 72 61 6d | 65 2e 0a 4d 65 61 73 75 |A's fram|e..Measu|
|000014c0| 72 65 64 20 69 6e 20 63 | 68 61 72 61 63 74 65 72 |red in c|haracter|
|000014d0| 73 2e 0a 54 68 69 73 20 | 69 73 20 75 73 65 64 20 |s..This |is used |
|000014e0| 62 79 20 74 68 65 20 64 | 65 66 61 75 6c 74 20 63 |by the d|efault c|
|000014f0| 6f 6e 74 72 6f 6c 20 66 | 72 61 6d 65 20 70 6f 73 |ontrol f|rame pos|
|00001500| 69 74 69 6f 6e 69 6e 67 | 20 66 75 6e 63 74 69 6f |itioning| functio|
|00001510| 6e 2c 0a 60 65 64 69 66 | 66 2d 6d 61 6b 65 2d 66 |n,.`edif|f-make-f|
|00001520| 72 61 6d 65 2d 70 6f 73 | 69 74 69 6f 6e 27 20 74 |rame-pos|ition' t|
|00001530| 6f 20 61 64 6a 75 73 74 | 20 74 68 65 20 70 6f 73 |o adjust| the pos|
|00001540| 69 74 69 6f 6e 20 6f 66 | 20 74 68 65 20 63 6f 6e |ition of| the con|
|00001550| 74 72 6f 6c 20 66 72 61 | 6d 65 0a 77 68 65 6e 20 |trol fra|me.when |
|00001560| 69 74 20 73 68 6f 77 73 | 20 74 68 65 20 66 75 6c |it shows| the ful|
|00001570| 6c 20 6d 65 6e 75 2e 20 | 54 68 69 73 20 76 61 72 |l menu. |This var|
|00001580| 69 61 62 6c 65 20 69 73 | 20 70 72 6f 76 69 64 65 |iable is| provide|
|00001590| 64 20 66 6f 72 20 65 61 | 73 79 0a 63 75 73 74 6f |d for ea|sy.custo|
|000015a0| 6d 69 7a 61 74 69 6f 6e | 20 6f 66 20 74 68 65 20 |mization| of the |
|000015b0| 64 65 66 61 75 6c 74 2e | 22 29 0a 28 64 65 66 76 |default.|").(defv|
|000015c0| 61 72 20 65 64 69 66 66 | 2d 77 69 64 65 2d 64 69 |ar ediff|-wide-di|
|000015d0| 73 70 6c 61 79 2d 70 20 | 6e 69 6c 20 22 5c 0a 22 |splay-p |nil "\."|
|000015e0| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|000015f0| 21 88 c2 c1 c3 c4 23 87 | 22 20 5b 6d 61 6b 65 2d |!.....#.|" [make-|
|00001600| 76 61 72 69 61 62 6c 65 | 2d 62 75 66 66 65 72 2d |variable|-buffer-|
|00001610| 6c 6f 63 61 6c 20 65 64 | 69 66 66 2d 77 69 64 65 |local ed|iff-wide|
|00001620| 2d 64 69 73 70 6c 61 79 | 2d 70 20 70 75 74 20 70 |-display|-p put p|
|00001630| 65 72 6d 61 6e 65 6e 74 | 2d 6c 6f 63 61 6c 20 74 |ermanent|-local t|
|00001640| 5d 20 34 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |] 4).(de|fvar edi|
|00001650| 66 66 2d 77 69 64 65 2d | 64 69 73 70 6c 61 79 2d |ff-wide-|display-|
|00001660| 6f 72 69 67 2d 70 61 72 | 61 6d 65 74 65 72 73 20 |orig-par|ameters |
|00001670| 6e 69 6c 20 22 5c 0a 46 | 72 61 6d 65 20 70 61 72 |nil "\.F|rame par|
|00001680| 61 6d 65 74 65 72 73 20 | 74 6f 20 62 65 20 72 65 |ameters |to be re|
|00001690| 73 74 6f 72 65 64 20 77 | 68 65 6e 20 74 68 65 20 |stored w|hen the |
|000016a0| 75 73 65 72 20 77 61 6e | 74 73 20 74 6f 20 74 6f |user wan|ts to to|
|000016b0| 67 67 6c 65 20 74 68 65 | 20 77 69 64 65 0a 64 69 |ggle the| wide.di|
|000016c0| 73 70 6c 61 79 20 6f 66 | 66 2e 22 29 0a 28 62 79 |splay of|f.").(by|
|000016d0| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|000016e0| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|000016f0| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00001700| 20 65 64 69 66 66 2d 77 | 69 64 65 2d 64 69 73 70 | ediff-w|ide-disp|
|00001710| 6c 61 79 2d 6f 72 69 67 | 2d 70 61 72 61 6d 65 74 |lay-orig|-paramet|
|00001720| 65 72 73 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |ers put |permanen|
|00001730| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 28 64 |t-local |t] 4).(d|
|00001740| 65 66 76 61 72 20 65 64 | 69 66 66 2d 77 69 64 65 |efvar ed|iff-wide|
|00001750| 2d 64 69 73 70 6c 61 79 | 2d 66 72 61 6d 65 20 6e |-display|-frame n|
|00001760| 69 6c 20 22 5c 0a 46 72 | 61 6d 65 20 74 6f 20 62 |il "\.Fr|ame to b|
|00001770| 65 20 75 73 65 64 20 66 | 6f 72 20 77 69 64 65 20 |e used f|or wide |
|00001780| 64 69 73 70 6c 61 79 2e | 22 29 0a 28 62 79 74 65 |display.|").(byte|
|00001790| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|000017a0| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|000017b0| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|000017c0| 64 69 66 66 2d 77 69 64 | 65 2d 64 69 73 70 6c 61 |diff-wid|e-displa|
|000017d0| 79 2d 66 72 61 6d 65 20 | 70 75 74 20 70 65 72 6d |y-frame |put perm|
|000017e0| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 74 5d 20 34 |anent-lo|cal t] 4|
|000017f0| 29 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |).(defva|r ediff-|
|00001800| 6d 61 6b 65 2d 77 69 64 | 65 2d 64 69 73 70 6c 61 |make-wid|e-displa|
|00001810| 79 2d 66 75 6e 63 74 69 | 6f 6e 20 27 65 64 69 66 |y-functi|on 'edif|
|00001820| 66 2d 6d 61 6b 65 2d 77 | 69 64 65 2d 64 69 73 70 |f-make-w|ide-disp|
|00001830| 6c 61 79 20 22 5c 0a 54 | 68 65 20 76 61 6c 75 65 |lay "\.T|he value|
|00001840| 20 69 73 20 61 20 66 75 | 6e 63 74 69 6f 6e 20 74 | is a fu|nction t|
|00001850| 68 61 74 20 69 73 20 63 | 61 6c 6c 65 64 20 74 6f |hat is c|alled to|
|00001860| 20 63 72 65 61 74 65 20 | 61 20 77 69 64 65 20 64 | create |a wide d|
|00001870| 69 73 70 6c 61 79 2e 0a | 54 68 65 20 66 75 6e 63 |isplay..|The func|
|00001880| 74 69 6f 6e 20 69 73 20 | 63 61 6c 6c 65 64 20 77 |tion is |called w|
|00001890| 69 74 68 6f 75 74 20 61 | 72 67 75 6d 65 6e 74 73 |ithout a|rguments|
|000018a0| 2e 20 49 74 20 73 68 6f | 75 6c 64 20 72 65 73 69 |. It sho|uld resi|
|000018b0| 7a 65 20 74 68 65 20 66 | 72 61 6d 65 20 69 6e 0a |ze the f|rame in.|
|000018c0| 77 68 69 63 68 20 62 75 | 66 66 65 72 73 20 41 2c |which bu|ffers A,|
|000018d0| 20 42 2c 20 61 6e 64 20 | 43 20 61 72 65 20 74 6f | B, and |C are to|
|000018e0| 20 62 65 20 64 69 73 70 | 6c 61 79 65 64 2c 20 61 | be disp|layed, a|
|000018f0| 6e 64 20 69 74 20 73 68 | 6f 75 6c 64 20 73 61 76 |nd it sh|ould sav|
|00001900| 65 20 74 68 65 20 6f 6c | 64 0a 66 72 61 6d 65 20 |e the ol|d.frame |
|00001910| 70 61 72 61 6d 65 74 65 | 72 73 20 69 6e 20 60 65 |paramete|rs in `e|
|00001920| 64 69 66 66 2d 77 69 64 | 65 2d 64 69 73 70 6c 61 |diff-wid|e-displa|
|00001930| 79 2d 6f 72 69 67 2d 70 | 61 72 61 6d 65 74 65 72 |y-orig-p|arameter|
|00001940| 73 27 2e 0a 54 68 65 20 | 76 61 72 69 61 62 6c 65 |s'..The |variable|
|00001950| 20 60 65 64 69 66 66 2d | 77 69 64 65 2d 64 69 73 | `ediff-|wide-dis|
|00001960| 70 6c 61 79 2d 66 72 61 | 6d 65 27 20 73 68 6f 75 |play-fra|me' shou|
|00001970| 6c 64 20 62 65 20 73 65 | 74 20 74 6f 20 63 6f 6e |ld be se|t to con|
|00001980| 74 61 69 6e 0a 74 68 65 | 20 66 72 61 6d 65 20 75 |tain.the| frame u|
|00001990| 73 65 64 20 66 6f 72 20 | 74 68 65 20 77 69 64 65 |sed for |the wide|
|000019a0| 20 64 69 73 70 6c 61 79 | 2e 22 29 0a 28 62 79 74 | display|.").(byt|
|000019b0| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 c3 c4 |e-code "|..!.....|
|000019c0| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|000019d0| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|000019e0| 65 64 69 66 66 2d 6d 61 | 6b 65 2d 77 69 64 65 2d |ediff-ma|ke-wide-|
|000019f0| 64 69 73 70 6c 61 79 2d | 66 75 6e 63 74 69 6f 6e |display-|function|
|00001a00| 20 70 75 74 20 70 65 72 | 6d 61 6e 65 6e 74 2d 6c | put per|manent-l|
|00001a10| 6f 63 61 6c 20 74 5d 20 | 34 29 0a 28 64 65 66 76 |ocal t] |4).(defv|
|00001a20| 61 72 20 65 64 69 66 66 | 2d 63 6f 6e 74 72 6f 6c |ar ediff|-control|
|00001a30| 2d 66 72 61 6d 65 20 6e | 69 6c 20 22 5c 0a 22 29 |-frame n|il "\.")|
|00001a40| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00001a50| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00001a60| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00001a70| 6f 63 61 6c 20 65 64 69 | 66 66 2d 63 6f 6e 74 72 |ocal edi|ff-contr|
|00001a80| 6f 6c 2d 66 72 61 6d 65 | 20 70 75 74 20 70 65 72 |ol-frame| put per|
|00001a90| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 74 5d 20 |manent-l|ocal t] |
|00001aa0| 34 29 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |4).(defv|ar ediff|
|00001ab0| 2d 70 72 65 66 65 72 2d | 69 63 6f 6e 69 66 69 65 |-prefer-|iconifie|
|00001ac0| 64 2d 63 6f 6e 74 72 6f | 6c 2d 66 72 61 6d 65 20 |d-contro|l-frame |
|00001ad0| 6e 69 6c 20 22 5c 0a 2a | 49 66 20 74 2c 20 6b 65 |nil "\.*|If t, ke|
|00001ae0| 65 70 20 63 6f 6e 74 72 | 6f 6c 20 70 61 6e 65 6c |ep contr|ol panel|
|00001af0| 20 69 63 6f 6e 69 66 69 | 65 64 20 77 68 65 6e 20 | iconifi|ed when |
|00001b00| 68 65 6c 70 20 6d 65 73 | 73 61 67 65 20 69 73 20 |help mes|sage is |
|00001b10| 6f 66 66 2e 0a 54 68 69 | 73 20 68 61 73 20 65 66 |off..Thi|s has ef|
|00001b20| 66 65 63 74 20 6f 6e 6c | 79 20 6f 6e 20 61 20 77 |fect onl|y on a w|
|00001b30| 69 6e 64 6f 77 69 6e 67 | 20 73 79 73 74 65 6d 2e |indowing| system.|
|00001b40| 0a 49 66 20 74 2c 20 68 | 69 74 69 6e 67 20 60 3f |.If t, h|iting `?|
|00001b50| 27 20 74 6f 20 74 6f 67 | 67 6c 65 20 63 6f 6e 74 |' to tog|gle cont|
|00001b60| 72 6f 6c 20 70 61 6e 65 | 6c 20 6f 66 66 20 69 63 |rol pane|l off ic|
|00001b70| 6f 6e 69 66 69 65 73 20 | 69 74 2e 0a 0a 54 68 69 |onifies |it...Thi|
|00001b80| 73 20 69 73 20 6f 6e 6c | 79 20 75 73 65 66 75 6c |s is onl|y useful|
|00001b90| 20 69 6e 20 45 6d 61 63 | 73 20 61 6e 64 20 6f 6e | in Emac|s and on|
|00001ba0| 6c 79 20 66 6f 72 20 63 | 65 72 74 61 69 6e 20 6b |ly for c|ertain k|
|00001bb0| 69 6e 64 73 20 6f 66 20 | 77 69 6e 64 6f 77 20 6d |inds of |window m|
|00001bc0| 61 6e 61 67 65 72 73 2c | 0a 73 75 63 68 20 61 73 |anagers,|.such as|
|00001bd0| 20 54 57 4d 20 61 6e 64 | 20 69 74 73 20 64 65 72 | TWM and| its der|
|00001be0| 69 76 61 74 69 76 65 73 | 2c 20 73 69 6e 63 65 20 |ivatives|, since |
|00001bf0| 74 68 65 20 77 69 6e 64 | 6f 77 20 6d 61 6e 61 67 |the wind|ow manag|
|00001c00| 65 72 20 6d 75 73 74 20 | 70 65 72 6d 69 74 0a 6b |er must |permit.k|
|00001c10| 65 79 62 6f 61 72 64 20 | 69 6e 70 75 74 20 74 6f |eyboard |input to|
|00001c20| 20 67 6f 20 69 6e 74 6f | 20 69 63 6f 6e 73 2e 20 | go into| icons. |
|00001c30| 58 45 6d 61 63 73 20 63 | 6f 6d 70 6c 65 74 65 6c |XEmacs c|ompletel|
|00001c40| 79 20 69 67 6e 6f 72 65 | 73 20 6b 65 79 62 6f 61 |y ignore|s keyboa|
|00001c50| 72 64 20 69 6e 70 75 74 | 0a 69 6e 74 6f 20 69 63 |rd input|.into ic|
|00001c60| 6f 6e 73 2c 20 72 65 67 | 61 72 64 6c 65 73 73 20 |ons, reg|ardless |
|00001c70| 6f 66 20 74 68 65 20 77 | 69 6e 64 6f 77 20 6d 61 |of the w|indow ma|
|00001c80| 6e 61 67 65 72 2e 22 29 | 0a 28 62 79 74 65 2d 63 |nager.")|.(byte-c|
|00001c90| 6f 64 65 20 22 c0 c1 4d | 88 c2 c3 4d 88 c4 c5 4d |ode "..M|...M...M|
|00001ca0| 88 c6 c7 4d 88 c8 c9 4d | 88 ca cb 4d 88 cc cd 4d |...M...M|...M...M|
|00001cb0| 88 ce cf 4d 88 d0 d1 4d | 88 d2 d3 4d 88 d4 d5 4d |...M...M|...M...M|
|00001cc0| 88 d6 d7 4d 88 d8 d9 4d | 88 da db 4d 87 22 20 5b |...M...M|...M." [|
|00001cd0| 65 64 69 66 66 2d 67 65 | 74 2d 77 69 6e 64 6f 77 |ediff-ge|t-window|
|00001ce0| 2d 62 79 2d 63 6c 69 63 | 6b 69 6e 67 20 23 5b 28 |-by-clic|king #[(|
|00001cf0| 77 69 6e 64 20 70 72 65 | 76 2d 77 69 6e 64 20 77 |wind pre|v-wind w|
|00001d00| 69 6e 64 2d 6e 75 6d 62 | 65 72 29 20 22 c0 19 c2 |ind-numb|er) "...|
|00001d10| c3 0c 5c 22 88 c5 20 89 | 11 19 0e 06 ab 85 c7 09 |..\".. .|........|
|00001d20| 21 aa 89 c8 c9 ca cb cc | 09 21 5c 22 5c 22 29 ac |!.......|.!\"\").|
|00001d30| 90 cd ce 21 ab 84 cf ce | 21 88 c2 d0 0c 5c 22 88 |...!....|!....\".|
|00001d40| aa 56 c5 20 88 0e 06 ab | 85 d1 09 21 aa 85 d2 d3 |.V. ....|...!....|
|00001d50| 09 21 21 89 16 14 29 87 | 22 20 5b 6e 69 6c 20 65 |.!!...).|" [nil e|
|00001d60| 76 65 6e 74 20 6d 65 73 | 73 61 67 65 20 22 53 65 |vent mes|sage "Se|
|00001d70| 6c 65 63 74 20 77 69 6e | 64 6f 77 73 20 62 79 20 |lect win|dows by |
|00001d80| 63 6c 69 63 6b 69 6e 67 | 2e 20 50 6c 65 61 73 65 |clicking|. Please|
|00001d90| 20 63 6c 69 63 6b 20 6f | 6e 20 57 69 6e 64 6f 77 | click o|n Window|
|00001da0| 20 25 64 20 22 20 77 69 | 6e 64 2d 6e 75 6d 62 65 | %d " wi|nd-numbe|
|00001db0| 72 20 65 64 69 66 66 2d | 72 65 61 64 2d 65 76 65 |r ediff-|read-eve|
|00001dc0| 6e 74 20 65 64 69 66 66 | 2d 78 65 6d 61 63 73 2d |nt ediff|-xemacs-|
|00001dd0| 70 20 62 75 74 74 6f 6e | 2d 65 76 65 6e 74 2d 70 |p button|-event-p|
|00001de0| 20 73 74 72 69 6e 67 2d | 6d 61 74 63 68 20 22 6d | string-|match "m|
|00001df0| 6f 75 73 65 22 20 66 6f | 72 6d 61 74 20 22 25 53 |ouse" fo|rmat "%S|
|00001e00| 22 20 65 76 65 6e 74 2d | 62 61 73 69 63 2d 74 79 |" event-|basic-ty|
|00001e10| 70 65 20 73 69 74 2d 66 | 6f 72 20 31 20 62 65 65 |pe sit-f|or 1 bee|
|00001e20| 70 20 22 50 6c 65 61 73 | 65 20 63 6c 69 63 6b 20 |p "Pleas|e click |
|00001e30| 6f 6e 20 57 69 6e 64 6f | 77 20 25 64 20 22 20 65 |on Windo|w %d " e|
|00001e40| 76 65 6e 74 2d 77 69 6e | 64 6f 77 20 70 6f 73 6e |vent-win|dow posn|
|00001e50| 2d 77 69 6e 64 6f 77 20 | 65 76 65 6e 74 2d 73 74 |-window |event-st|
|00001e60| 61 72 74 20 77 69 6e 64 | 5d 20 36 5d 20 65 64 69 |art wind|] 6] edi|
|00001e70| 66 66 2d 73 65 6c 65 63 | 74 2d 6c 6f 77 65 73 74 |ff-selec|t-lowest|
|00001e80| 2d 77 69 6e 64 6f 77 20 | 23 5b 6e 69 6c 20 22 08 |-window |#[nil ".|
|00001e90| ab 85 c1 c2 20 21 87 c3 | 20 1c c5 20 41 41 41 40 |.... !..| .. AAA@|
|00001ea0| 1e 06 8a c7 c8 21 88 c3 | 20 29 1e 09 ca 1e 0b 0e |.....!..| )......|
|00001eb0| 0b ad b2 cc 20 1e 0d c5 | 0e 0d 21 41 41 41 40 1e |.... ...|..!AAA@.|
|00001ec0| 0e 0e 06 0e 0e 57 ab 87 | 0e 0e 16 06 0e 0d 14 c1 |.....W..|........|
|00001ed0| 0e 0d 21 88 0e 09 0e 0d | 3d ab 87 c1 0c 21 88 cf |..!.....|=....!..|
|00001ee0| 16 0b 2a aa 4a 2c 87 22 | 20 5b 65 64 69 66 66 2d |..*.J,."| [ediff-|
|00001ef0| 78 65 6d 61 63 73 2d 70 | 20 73 65 6c 65 63 74 2d |xemacs-p| select-|
|00001f00| 77 69 6e 64 6f 77 20 66 | 72 61 6d 65 2d 6c 6f 77 |window f|rame-low|
|00001f10| 65 73 74 2d 77 69 6e 64 | 6f 77 20 73 65 6c 65 63 |est-wind|ow selec|
|00001f20| 74 65 64 2d 77 69 6e 64 | 6f 77 20 6c 6f 77 65 73 |ted-wind|ow lowes|
|00001f30| 74 2d 77 69 6e 64 6f 77 | 20 77 69 6e 64 6f 77 2d |t-window| window-|
|00001f40| 65 64 67 65 73 20 62 6f | 74 74 6f 6d 2d 65 64 67 |edges bo|ttom-edg|
|00001f50| 65 20 6f 74 68 65 72 2d | 77 69 6e 64 6f 77 20 2d |e other-|window -|
|00001f60| 31 20 6c 61 73 74 2d 77 | 69 6e 64 6f 77 20 74 20 |1 last-w|indow t |
|00001f70| 77 69 6e 64 6f 77 2d 73 | 65 61 72 63 68 20 6e 65 |window-s|earch ne|
|00001f80| 78 74 2d 77 69 6e 64 6f | 77 20 74 68 69 73 2d 77 |xt-windo|w this-w|
|00001f90| 69 6e 64 6f 77 20 6e 65 | 78 74 2d 62 6f 74 74 6f |indow ne|xt-botto|
|00001fa0| 6d 2d 65 64 67 65 20 6e | 69 6c 5d 20 32 5d 20 65 |m-edge n|il] 2] e|
|00001fb0| 64 69 66 66 2d 73 65 74 | 75 70 2d 77 69 6e 64 6f |diff-set|up-windo|
|00001fc0| 77 73 20 23 5b 28 62 75 | 66 66 65 72 2d 41 20 62 |ws #[(bu|ffer-A b|
|00001fd0| 75 66 66 65 72 2d 42 20 | 62 75 66 66 65 72 2d 43 |uffer-B |buffer-C|
|00001fe0| 20 63 6f 6e 74 72 6f 6c | 2d 62 75 66 66 65 72 29 | control|-buffer)|
|00001ff0| 20 22 c0 c1 21 88 c2 20 | c3 20 3d ab 84 c4 c5 21 | "..!.. |. =....!|
|00002000| 88 c6 20 ac 83 c7 16 08 | c9 0e 5c 6e 21 ac b4 70 |.. .....|..\n!..p|
|00002010| 1e 0b 0e 5c 6e ab 99 cc | 0e 5c 6e 21 ab 93 cd cc |...\n...|.\n!....|
|00002020| 0e 5c 6e 21 21 ab 8b ce | 8e 0e 5c 6e 71 88 0e 08 |.\n!!...|..\nq...|
|00002030| 29 aa 89 0e 0f d0 3d ae | 83 d1 d2 21 29 0e 13 0e |).....=.|...!)...|
|00002040| 14 0e 15 0e 5c 6e 24 88 | c0 d6 21 87 22 20 5b 72 |....\n$.|..!." [r|
|00002050| 75 6e 2d 68 6f 6f 6b 73 | 20 65 64 69 66 66 2d 62 |un-hooks| ediff-b|
|00002060| 65 66 6f 72 65 2d 73 65 | 74 75 70 2d 77 69 6e 64 |efore-se|tup-wind|
|00002070| 6f 77 73 2d 68 6f 6f 6b | 73 20 73 65 6c 65 63 74 |ows-hook|s select|
|00002080| 65 64 2d 77 69 6e 64 6f | 77 20 6d 69 6e 69 62 75 |ed-windo|w minibu|
|00002090| 66 66 65 72 2d 77 69 6e | 64 6f 77 20 6f 74 68 65 |ffer-win|dow othe|
|000020a0| 72 2d 77 69 6e 64 6f 77 | 20 31 20 65 64 69 66 66 |r-window| 1 ediff|
|000020b0| 2d 77 69 6e 64 6f 77 2d | 64 69 73 70 6c 61 79 2d |-window-|display-|
|000020c0| 70 20 65 64 69 66 66 2d | 73 65 74 75 70 2d 77 69 |p ediff-|setup-wi|
|000020d0| 6e 64 6f 77 73 2d 70 6c | 61 69 6e 20 65 64 69 66 |ndows-pl|ain edif|
|000020e0| 66 2d 77 69 6e 64 6f 77 | 2d 73 65 74 75 70 2d 66 |f-window|-setup-f|
|000020f0| 75 6e 63 74 69 6f 6e 20 | 65 64 69 66 66 2d 6b 65 |unction |ediff-ke|
|00002100| 65 70 2d 77 69 6e 64 6f | 77 2d 63 6f 6e 66 69 67 |ep-windo|w-config|
|00002110| 20 63 6f 6e 74 72 6f 6c | 2d 62 75 66 66 65 72 20 | control|-buffer |
|00002120| 53 74 61 72 74 42 75 66 | 66 65 72 20 67 65 74 2d |StartBuf|fer get-|
|00002130| 62 75 66 66 65 72 20 62 | 75 66 66 65 72 2d 6e 61 |buffer b|uffer-na|
|00002140| 6d 65 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |me ((set|-buffer |
|00002150| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 74 68 |StartBuf|fer)) th|
|00002160| 69 73 2d 63 6f 6d 6d 61 | 6e 64 20 65 64 69 66 66 |is-comma|nd ediff|
|00002170| 2d 71 75 69 74 20 65 72 | 72 6f 72 20 22 59 6f 75 |-quit er|ror "You|
|00002180| 27 76 65 20 6b 69 6c 6c | 65 64 20 61 6e 20 65 73 |'ve kill|ed an es|
|00002190| 73 65 6e 74 69 61 6c 20 | 45 64 69 66 66 20 62 75 |sential |Ediff bu|
|000021a0| 66 66 65 72 2d 2d 2d 50 | 6c 65 61 73 65 20 71 75 |ffer---P|lease qu|
|000021b0| 69 74 20 45 64 69 66 66 | 22 20 62 75 66 66 65 72 |it Ediff|" buffer|
|000021c0| 2d 41 20 62 75 66 66 65 | 72 2d 42 20 62 75 66 66 |-A buffe|r-B buff|
|000021d0| 65 72 2d 43 20 65 64 69 | 66 66 2d 61 66 74 65 72 |er-C edi|ff-after|
|000021e0| 2d 73 65 74 75 70 2d 77 | 69 6e 64 6f 77 73 2d 68 |-setup-w|indows-h|
|000021f0| 6f 6f 6b 73 5d 20 35 5d | 20 65 64 69 66 66 2d 73 |ooks] 5]| ediff-s|
|00002200| 65 74 75 70 2d 77 69 6e | 64 6f 77 73 2d 70 6c 61 |etup-win|dows-pla|
|00002210| 69 6e 20 23 5b 28 62 75 | 66 66 65 72 2d 41 20 62 |in #[(bu|ffer-A b|
|00002220| 75 66 66 65 72 2d 42 20 | 62 75 66 66 65 72 2d 43 |uffer-B |buffer-C|
|00002230| 20 63 6f 6e 74 72 6f 6c | 2d 62 75 66 66 65 72 29 | control|-buffer)|
|00002240| 20 22 70 18 09 ab 97 c2 | 09 21 ab 92 c3 c2 09 21 | "p.....|.!.....!|
|00002250| 21 ab 8b c4 8e 09 71 88 | c5 16 06 29 aa 8a 0e 07 |!.....q.|...)....|
|00002260| c8 3d ac 84 c9 ca 21 88 | 29 0e 0b ab 8a cc 0e 0d |.=....!.|).......|
|00002270| 0e 0e 0e 0f 09 24 87 d0 | 0e 0d 0e 0e 0e 0f 09 24 |.....$..|.......$|
|00002280| 87 22 20 5b 53 74 61 72 | 74 42 75 66 66 65 72 20 |." [Star|tBuffer |
|00002290| 63 6f 6e 74 72 6f 6c 2d | 62 75 66 66 65 72 20 67 |control-|buffer g|
|000022a0| 65 74 2d 62 75 66 66 65 | 72 20 62 75 66 66 65 72 |et-buffe|r buffer|
|000022b0| 2d 6e 61 6d 65 20 28 28 | 73 65 74 2d 62 75 66 66 |-name ((|set-buff|
|000022c0| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|000022d0| 20 6e 69 6c 20 65 64 69 | 66 66 2d 6d 75 6c 74 69 | nil edi|ff-multi|
|000022e0| 66 72 61 6d 65 20 74 68 | 69 73 2d 63 6f 6d 6d 61 |frame th|is-comma|
|000022f0| 6e 64 20 65 64 69 66 66 | 2d 71 75 69 74 20 65 72 |nd ediff|-quit er|
|00002300| 72 6f 72 20 22 59 6f 75 | 27 76 65 20 6b 69 6c 6c |ror "You|'ve kill|
|00002310| 65 64 20 61 6e 20 65 73 | 73 65 6e 74 69 61 6c 20 |ed an es|sential |
|00002320| 45 64 69 66 66 20 62 75 | 66 66 65 72 2d 2d 2d 50 |Ediff bu|ffer---P|
|00002330| 6c 65 61 73 65 20 71 75 | 69 74 20 45 64 69 66 66 |lease qu|it Ediff|
|00002340| 22 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 6a 6f |" ediff-|merge-jo|
|00002350| 62 20 65 64 69 66 66 2d | 73 65 74 75 70 2d 77 69 |b ediff-|setup-wi|
|00002360| 6e 64 6f 77 73 2d 70 6c | 61 69 6e 2d 6d 65 72 67 |ndows-pl|ain-merg|
|00002370| 65 20 62 75 66 66 65 72 | 2d 41 20 62 75 66 66 65 |e buffer|-A buffe|
|00002380| 72 2d 42 20 62 75 66 66 | 65 72 2d 43 20 65 64 69 |r-B buff|er-C edi|
|00002390| 66 66 2d 73 65 74 75 70 | 2d 77 69 6e 64 6f 77 73 |ff-setup|-windows|
|000023a0| 2d 70 6c 61 69 6e 2d 63 | 6f 6d 70 61 72 65 5d 20 |-plain-c|ompare] |
|000023b0| 35 5d 20 65 64 69 66 66 | 2d 73 65 74 75 70 2d 77 |5] ediff|-setup-w|
|000023c0| 69 6e 64 6f 77 73 2d 70 | 6c 61 69 6e 2d 6d 65 72 |indows-p|lain-mer|
|000023d0| 67 65 20 23 5b 28 62 75 | 66 2d 41 20 62 75 66 2d |ge #[(bu|f-A buf-|
|000023e0| 42 20 62 75 66 2d 43 20 | 63 6f 6e 74 72 6f 6c 2d |B buf-C |control-|
|000023f0| 62 75 66 66 65 72 29 20 | 22 c0 09 21 88 c2 c3 89 |buffer) |"..!....|
|00002400| 89 89 89 89 1c 1d 1e 06 | 1e 07 1e 08 1e 09 1e 5c |........|.......\|
|00002410| 6e 70 1e 0b 09 ab 9c cc | 09 21 ab 97 cd cc 09 21 |np......|.!.....!|
|00002420| 21 ab 90 ce 8e 09 71 88 | 0e 0f 16 08 0e 10 16 09 |!.....q.|........|
|00002430| 29 aa 8a 0e 11 d2 3d ac | 84 d3 d4 21 88 29 d5 20 |).....=.|...!.). |
|00002440| 88 d6 20 88 d7 20 88 d8 | 09 21 88 d9 da 21 88 c2 |.. .. ..|.!...!..|
|00002450| db dc 20 0e 08 5f 21 5d | 16 07 dd 0e 1e 21 88 df |.. .._!]|.....!..|
|00002460| 20 16 06 d6 c2 dc 20 0e | 07 5a 5d 21 88 df 20 0e | ..... .|.Z]!.. .|
|00002470| 06 3d ab 84 d9 da 21 88 | df 20 14 dd 0e 20 21 88 |.=....!.|. ... !.|
|00002480| e1 0e 06 21 88 0e 09 20 | 88 df 20 0e 06 3d ab 84 |...!... |.. ..=..|
|00002490| d9 da 21 88 dd 0e 5c 22 | 21 88 df 20 15 70 1e 0b |..!...\"|!.. .p..|
|000024a0| 09 ab 9e cc 09 21 ab 99 | cd cc 09 21 21 ab 92 e3 |.....!..|...!!...|
|000024b0| 8e 09 71 88 0e 06 16 24 | 0d 16 25 0c 16 26 29 aa |..q....$|..%..&).|
|000024c0| 8a 0e 11 d2 3d ac 84 d3 | d4 21 88 29 d7 20 88 d8 |....=...|.!.). ..|
|000024d0| 09 21 2e 07 87 22 20 5b | 65 64 69 66 66 2d 64 65 |.!..." [|ediff-de|
|000024e0| 73 74 72 6f 79 2d 63 6f | 6e 74 72 6f 6c 2d 66 72 |stroy-co|ntrol-fr|
|000024f0| 61 6d 65 20 63 6f 6e 74 | 72 6f 6c 2d 62 75 66 66 |ame cont|rol-buff|
|00002500| 65 72 20 32 20 6e 69 6c | 20 77 69 6e 64 2d 43 20 |er 2 nil| wind-C |
|00002510| 77 69 6e 64 2d 42 20 77 | 69 6e 64 2d 41 20 6d 65 |wind-B w|ind-A me|
|00002520| 72 67 65 2d 77 69 6e 64 | 6f 77 2d 6c 69 6e 65 73 |rge-wind|ow-lines|
|00002530| 20 6d 65 72 67 65 2d 77 | 69 6e 64 6f 77 2d 73 68 | merge-w|indow-sh|
|00002540| 61 72 65 20 73 70 6c 69 | 74 2d 77 69 6e 64 6f 77 |are spli|t-window|
|00002550| 2d 66 75 6e 63 74 69 6f | 6e 20 77 69 6e 64 6f 77 |-functio|n window|
|00002560| 2d 6d 69 6e 2d 68 65 69 | 67 68 74 20 53 74 61 72 |-min-hei|ght Star|
|00002570| 74 42 75 66 66 65 72 20 | 67 65 74 2d 62 75 66 66 |tBuffer |get-buff|
|00002580| 65 72 20 62 75 66 66 65 | 72 2d 6e 61 6d 65 20 28 |er buffe|r-name (|
|00002590| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|000025a0| 74 42 75 66 66 65 72 29 | 29 20 65 64 69 66 66 2d |tBuffer)|) ediff-|
|000025b0| 6d 65 72 67 65 2d 77 69 | 6e 64 6f 77 2d 73 68 61 |merge-wi|ndow-sha|
|000025c0| 72 65 20 65 64 69 66 66 | 2d 73 70 6c 69 74 2d 77 |re ediff|-split-w|
|000025d0| 69 6e 64 6f 77 2d 66 75 | 6e 63 74 69 6f 6e 20 74 |indow-fu|nction t|
|000025e0| 68 69 73 2d 63 6f 6d 6d | 61 6e 64 20 65 64 69 66 |his-comm|and edif|
|000025f0| 66 2d 71 75 69 74 20 65 | 72 72 6f 72 20 22 59 6f |f-quit e|rror "Yo|
|00002600| 75 27 76 65 20 6b 69 6c | 6c 65 64 20 61 6e 20 65 |u've kil|led an e|
|00002610| 73 73 65 6e 74 69 61 6c | 20 45 64 69 66 66 20 62 |ssential| Ediff b|
|00002620| 75 66 66 65 72 2d 2d 2d | 50 6c 65 61 73 65 20 71 |uffer---|Please q|
|00002630| 75 69 74 20 45 64 69 66 | 66 22 20 64 65 6c 65 74 |uit Edif|f" delet|
|00002640| 65 2d 6f 74 68 65 72 2d | 77 69 6e 64 6f 77 73 20 |e-other-|windows |
|00002650| 73 70 6c 69 74 2d 77 69 | 6e 64 6f 77 2d 76 65 72 |split-wi|ndow-ver|
|00002660| 74 69 63 61 6c 6c 79 20 | 65 64 69 66 66 2d 73 65 |tically |ediff-se|
|00002670| 6c 65 63 74 2d 6c 6f 77 | 65 73 74 2d 77 69 6e 64 |lect-low|est-wind|
|00002680| 6f 77 20 65 64 69 66 66 | 2d 73 65 74 75 70 2d 63 |ow ediff|-setup-c|
|00002690| 6f 6e 74 72 6f 6c 2d 62 | 75 66 66 65 72 20 6f 74 |ontrol-b|uffer ot|
|000026a0| 68 65 72 2d 77 69 6e 64 | 6f 77 20 31 20 72 6f 75 |her-wind|ow 1 rou|
|000026b0| 6e 64 20 77 69 6e 64 6f | 77 2d 68 65 69 67 68 74 |nd windo|w-height|
|000026c0| 20 73 77 69 74 63 68 2d | 74 6f 2d 62 75 66 66 65 | switch-|to-buffe|
|000026d0| 72 20 62 75 66 2d 41 20 | 73 65 6c 65 63 74 65 64 |r buf-A |selected|
|000026e0| 2d 77 69 6e 64 6f 77 20 | 62 75 66 2d 43 20 73 65 |-window |buf-C se|
|000026f0| 6c 65 63 74 2d 77 69 6e | 64 6f 77 20 62 75 66 2d |lect-win|dow buf-|
|00002700| 42 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |B ((set-|buffer S|
|00002710| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 65 64 69 |tartBuff|er)) edi|
|00002720| 66 66 2d 77 69 6e 64 6f | 77 2d 41 20 65 64 69 66 |ff-windo|w-A edif|
|00002730| 66 2d 77 69 6e 64 6f 77 | 2d 42 20 65 64 69 66 66 |f-window|-B ediff|
|00002740| 2d 77 69 6e 64 6f 77 2d | 43 5d 20 37 5d 20 65 64 |-window-|C] 7] ed|
|00002750| 69 66 66 2d 73 65 74 75 | 70 2d 77 69 6e 64 6f 77 |iff-setu|p-window|
|00002760| 73 2d 70 6c 61 69 6e 2d | 63 6f 6d 70 61 72 65 20 |s-plain-|compare |
|00002770| 23 5b 28 62 75 66 2d 41 | 20 62 75 66 2d 42 20 62 |#[(buf-A| buf-B b|
|00002780| 75 66 2d 43 20 63 6f 6e | 74 72 6f 6c 2d 62 75 66 |uf-C con|trol-buf|
|00002790| 66 65 72 29 20 22 c0 09 | 21 88 c2 c3 89 89 89 89 |fer) "..|!.......|
|000027a0| 89 89 89 1c 1d 1e 06 1e | 07 1e 08 1e 09 1e 5c 6e |........|......\n|
|000027b0| 1e 0b 1e 0c 70 1e 0d 09 | ab d5 ce 09 21 ab d0 cf |....p...|....!...|
|000027c0| ce 09 21 21 ab c9 d0 8e | 09 71 88 0e 11 40 1e 12 |..!!....|.q...@..|
|000027d0| d3 0e 12 21 ad 8e 0e 14 | ab 86 d5 0e 12 21 aa 84 |...!....|.....!..|
|000027e0| d6 0e 12 21 29 16 08 0e | 11 41 40 1e 12 d3 0e 12 |...!)...|.A@.....|
|000027f0| 21 ad 8e 0e 14 ab 86 d5 | 0e 12 21 aa 84 d6 0e 12 |!.......|..!.....|
|00002800| 21 29 16 07 0e 17 16 0b | 0e 18 16 09 29 aa 8a 0e |!)......|....)...|
|00002810| 19 da 3d ac 84 db dc 21 | 88 29 dd 20 88 de 20 88 |..=....!|.). .. .|
|00002820| df 20 88 e0 09 21 88 e1 | e2 21 88 e3 0e 24 21 88 |. ...!..|.!...$!.|
|00002830| e5 20 16 06 0e 09 ab 94 | 0e 0b de 3d ab 86 e6 0e |. ......|...=....|
|00002840| 06 21 aa 84 e7 0e 06 21 | e8 a5 16 5c 6e 0e 0b 0e |.!.....!|...\n...|
|00002850| 5c 6e 21 88 e5 20 0e 06 | 3d ab 84 e1 e2 21 88 e3 |\n!.. ..|=....!..|
|00002860| 0e 29 21 88 e5 20 15 0e | 09 ab 96 0e 0b 20 88 e5 |.)!.. ..|..... ..|
|00002870| 20 0d 3d ab 84 e1 e2 21 | 88 e3 0e 2a 21 88 e5 20 | .=....!|...*!.. |
|00002880| 14 70 1e 0d 09 ab 9e ce | 09 21 ab 99 cf ce 09 21 |.p......|.!.....!|
|00002890| 21 ab 92 eb 8e 09 71 88 | 0e 06 16 2c 0d 16 2d 0c |!.....q.|...,..-.|
|000028a0| 16 2e 29 aa 8a 0e 19 da | 3d ac 84 db dc 21 88 29 |..).....|=....!.)|
|000028b0| 0e 2f ab 8d f0 0e 06 0e | 08 5c 22 88 f0 0d 0e 07 |./......|.\".....|
|000028c0| 5c 22 88 df 20 88 e0 09 | 21 2e 09 87 22 20 5b 65 |\".. ...|!..." [e|
|000028d0| 64 69 66 66 2d 64 65 73 | 74 72 6f 79 2d 63 6f 6e |diff-des|troy-con|
|000028e0| 74 72 6f 6c 2d 66 72 61 | 6d 65 20 63 6f 6e 74 72 |trol-fra|me contr|
|000028f0| 6f 6c 2d 62 75 66 66 65 | 72 20 32 20 6e 69 6c 20 |ol-buffe|r 2 nil |
|00002900| 77 69 6e 64 2d 43 20 77 | 69 6e 64 2d 42 20 77 69 |wind-C w|ind-B wi|
|00002910| 6e 64 2d 41 20 77 69 6e | 64 2d 42 2d 73 74 61 72 |nd-A win|d-B-star|
|00002920| 74 20 77 69 6e 64 2d 41 | 2d 73 74 61 72 74 20 74 |t wind-A|-start t|
|00002930| 68 72 65 65 2d 77 61 79 | 2d 63 6f 6d 70 61 72 69 |hree-way|-compari|
|00002940| 73 6f 6e 20 77 69 6e 64 | 2d 77 69 64 74 68 2d 6f |son wind|-width-o|
|00002950| 72 2d 68 65 69 67 68 74 | 20 73 70 6c 69 74 2d 77 |r-height| split-w|
|00002960| 69 6e 64 6f 77 2d 66 75 | 6e 63 74 69 6f 6e 20 77 |indow-fu|nction w|
|00002970| 69 6e 64 6f 77 2d 6d 69 | 6e 2d 68 65 69 67 68 74 |indow-mi|n-height|
|00002980| 20 53 74 61 72 74 42 75 | 66 66 65 72 20 67 65 74 | StartBu|ffer get|
|00002990| 2d 62 75 66 66 65 72 20 | 62 75 66 66 65 72 2d 6e |-buffer |buffer-n|
|000029a0| 61 6d 65 20 28 28 73 65 | 74 2d 62 75 66 66 65 72 |ame ((se|t-buffer|
|000029b0| 20 53 74 61 72 74 42 75 | 66 66 65 72 29 29 20 65 | StartBu|ffer)) e|
|000029c0| 64 69 66 66 2d 6e 61 72 | 72 6f 77 2d 62 6f 75 6e |diff-nar|row-boun|
|000029d0| 64 73 20 6f 76 65 72 6c | 20 65 64 69 66 66 2d 6f |ds overl| ediff-o|
|000029e0| 76 65 72 6c 61 79 70 20 | 65 64 69 66 66 2d 65 6d |verlayp |ediff-em|
|000029f0| 61 63 73 2d 70 20 6f 76 | 65 72 6c 61 79 2d 73 74 |acs-p ov|erlay-st|
|00002a00| 61 72 74 20 65 78 74 65 | 6e 74 2d 73 74 61 72 74 |art exte|nt-start|
|00002a10| 2d 70 6f 73 69 74 69 6f | 6e 20 65 64 69 66 66 2d |-positio|n ediff-|
|00002a20| 73 70 6c 69 74 2d 77 69 | 6e 64 6f 77 2d 66 75 6e |split-wi|ndow-fun|
|00002a30| 63 74 69 6f 6e 20 65 64 | 69 66 66 2d 33 77 61 79 |ction ed|iff-3way|
|00002a40| 2d 63 6f 6d 70 61 72 69 | 73 6f 6e 2d 6a 6f 62 20 |-compari|son-job |
|00002a50| 74 68 69 73 2d 63 6f 6d | 6d 61 6e 64 20 65 64 69 |this-com|mand edi|
|00002a60| 66 66 2d 71 75 69 74 20 | 65 72 72 6f 72 20 22 59 |ff-quit |error "Y|
|00002a70| 6f 75 27 76 65 20 6b 69 | 6c 6c 65 64 20 61 6e 20 |ou've ki|lled an |
|00002a80| 65 73 73 65 6e 74 69 61 | 6c 20 45 64 69 66 66 20 |essentia|l Ediff |
|00002a90| 62 75 66 66 65 72 2d 2d | 2d 50 6c 65 61 73 65 20 |buffer--|-Please |
|00002aa0| 71 75 69 74 20 45 64 69 | 66 66 22 20 64 65 6c 65 |quit Edi|ff" dele|
|00002ab0| 74 65 2d 6f 74 68 65 72 | 2d 77 69 6e 64 6f 77 73 |te-other|-windows|
|00002ac0| 20 73 70 6c 69 74 2d 77 | 69 6e 64 6f 77 2d 76 65 | split-w|indow-ve|
|00002ad0| 72 74 69 63 61 6c 6c 79 | 20 65 64 69 66 66 2d 73 |rtically| ediff-s|
|00002ae0| 65 6c 65 63 74 2d 6c 6f | 77 65 73 74 2d 77 69 6e |elect-lo|west-win|
|00002af0| 64 6f 77 20 65 64 69 66 | 66 2d 73 65 74 75 70 2d |dow edif|f-setup-|
|00002b00| 63 6f 6e 74 72 6f 6c 2d | 62 75 66 66 65 72 20 6f |control-|buffer o|
|00002b10| 74 68 65 72 2d 77 69 6e | 64 6f 77 20 31 20 73 77 |ther-win|dow 1 sw|
|00002b20| 69 74 63 68 2d 74 6f 2d | 62 75 66 66 65 72 20 62 |itch-to-|buffer b|
|00002b30| 75 66 2d 41 20 73 65 6c | 65 63 74 65 64 2d 77 69 |uf-A sel|ected-wi|
|00002b40| 6e 64 6f 77 20 77 69 6e | 64 6f 77 2d 68 65 69 67 |ndow win|dow-heig|
|00002b50| 68 74 20 77 69 6e 64 6f | 77 2d 77 69 64 74 68 20 |ht windo|w-width |
|00002b60| 33 20 62 75 66 2d 42 20 | 62 75 66 2d 43 20 28 28 |3 buf-B |buf-C ((|
|00002b70| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|00002b80| 42 75 66 66 65 72 29 29 | 20 65 64 69 66 66 2d 77 |Buffer))| ediff-w|
|00002b90| 69 6e 64 6f 77 2d 41 20 | 65 64 69 66 66 2d 77 69 |indow-A |ediff-wi|
|00002ba0| 6e 64 6f 77 2d 42 20 65 | 64 69 66 66 2d 77 69 6e |ndow-B e|diff-win|
|00002bb0| 64 6f 77 2d 43 20 65 64 | 69 66 66 2d 77 69 6e 64 |dow-C ed|iff-wind|
|00002bc0| 6f 77 73 2d 6a 6f 62 20 | 73 65 74 2d 77 69 6e 64 |ows-job |set-wind|
|00002bd0| 6f 77 2d 73 74 61 72 74 | 5d 20 39 5d 20 65 64 69 |ow-start|] 9] edi|
|00002be0| 66 66 2d 73 65 74 75 70 | 2d 77 69 6e 64 6f 77 73 |ff-setup|-windows|
|00002bf0| 2d 6d 75 6c 74 69 66 72 | 61 6d 65 20 23 5b 28 62 |-multifr|ame #[(b|
|00002c00| 75 66 2d 41 20 62 75 66 | 2d 42 20 62 75 66 2d 43 |uf-A buf|-B buf-C|
|00002c10| 20 63 6f 6e 74 72 6f 6c | 2d 62 75 66 29 20 22 70 | control|-buf) "p|
|00002c20| 18 09 ab 97 c2 09 21 ab | 92 c3 c2 09 21 21 ab 8b |......!.|....!!..|
|00002c30| c4 8e 09 71 88 c5 16 06 | 29 aa 8a 0e 07 c8 3d ac |...q....|).....=.|
|00002c40| 84 c9 ca 21 88 29 0e 0b | ab 8a cc 0e 0d 0e 0e 0e |...!.)..|........|
|00002c50| 0f 09 24 87 d0 0e 0d 0e | 0e 0e 0f 09 24 87 22 20 |..$.....|....$." |
|00002c60| 5b 53 74 61 72 74 42 75 | 66 66 65 72 20 63 6f 6e |[StartBu|ffer con|
|00002c70| 74 72 6f 6c 2d 62 75 66 | 20 67 65 74 2d 62 75 66 |trol-buf| get-buf|
|00002c80| 66 65 72 20 62 75 66 66 | 65 72 2d 6e 61 6d 65 20 |fer buff|er-name |
|00002c90| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|00002ca0| 72 74 42 75 66 66 65 72 | 29 29 20 74 20 65 64 69 |rtBuffer|)) t edi|
|00002cb0| 66 66 2d 6d 75 6c 74 69 | 66 72 61 6d 65 20 74 68 |ff-multi|frame th|
|00002cc0| 69 73 2d 63 6f 6d 6d 61 | 6e 64 20 65 64 69 66 66 |is-comma|nd ediff|
|00002cd0| 2d 71 75 69 74 20 65 72 | 72 6f 72 20 22 59 6f 75 |-quit er|ror "You|
|00002ce0| 27 76 65 20 6b 69 6c 6c | 65 64 20 61 6e 20 65 73 |'ve kill|ed an es|
|00002cf0| 73 65 6e 74 69 61 6c 20 | 45 64 69 66 66 20 62 75 |sential |Ediff bu|
|00002d00| 66 66 65 72 2d 2d 2d 50 | 6c 65 61 73 65 20 71 75 |ffer---P|lease qu|
|00002d10| 69 74 20 45 64 69 66 66 | 22 20 65 64 69 66 66 2d |it Ediff|" ediff-|
|00002d20| 6d 65 72 67 65 2d 6a 6f | 62 20 65 64 69 66 66 2d |merge-jo|b ediff-|
|00002d30| 73 65 74 75 70 2d 77 69 | 6e 64 6f 77 73 2d 6d 75 |setup-wi|ndows-mu|
|00002d40| 6c 74 69 66 72 61 6d 65 | 2d 6d 65 72 67 65 20 62 |ltiframe|-merge b|
|00002d50| 75 66 2d 41 20 62 75 66 | 2d 42 20 62 75 66 2d 43 |uf-A buf|-B buf-C|
|00002d60| 20 65 64 69 66 66 2d 73 | 65 74 75 70 2d 77 69 6e | ediff-s|etup-win|
|00002d70| 64 6f 77 73 2d 6d 75 6c | 74 69 66 72 61 6d 65 2d |dows-mul|tiframe-|
|00002d80| 63 6f 6d 70 61 72 65 5d | 20 35 5d 20 65 64 69 66 |compare]| 5] edif|
|00002d90| 66 2d 73 65 74 75 70 2d | 77 69 6e 64 6f 77 73 2d |f-setup-|windows-|
|00002da0| 6d 75 6c 74 69 66 72 61 | 6d 65 2d 6d 65 72 67 65 |multifra|me-merge|
|00002db0| 20 23 5b 28 62 75 66 2d | 41 20 62 75 66 2d 42 20 | #[(buf-|A buf-B |
|00002dc0| 62 75 66 2d 43 20 63 6f | 6e 74 72 6f 6c 2d 62 75 |buf-C co|ntrol-bu|
|00002dd0| 66 29 20 22 c0 c1 21 88 | c2 1b c4 0d 21 1e 06 c4 |f) "..!.|....!...|
|00002de0| 0e 07 21 1e 08 c4 0e 09 | 21 1e 5c 6e 0e 06 ad 84 |..!.....|!.\n....|
|00002df0| cb 0e 06 21 1e 0c 0e 08 | ad 84 cb 0e 08 21 1e 0d |...!....|.....!..|
|00002e00| 0e 5c 6e ad 84 cb 0e 5c | 6e 21 1e 0e 70 1e 0f 0e |.\n....\|n!..p...|
|00002e10| 10 ab 99 d1 0e 10 21 ab | 93 d2 d1 0e 10 21 21 ab |......!.|.....!!.|
|00002e20| 8b d3 8e 0e 10 71 88 0e | 14 29 aa 89 0e 15 d6 3d |.....q..|.).....=|
|00002e30| ae 83 d7 d8 21 29 1e 19 | 70 1e 0f 0e 10 ab 99 d1 |....!)..|p.......|
|00002e40| 0e 10 21 ab 93 d2 d1 0e | 10 21 21 ab 8b da 8e 0e |..!.....|.!!.....|
|00002e50| 10 71 88 0e 1b 29 aa 89 | 0e 15 d6 3d ae 83 d7 d8 |.q...)..|...=....|
|00002e60| 21 29 1e 1c dd 20 1e 1e | df 20 1e 20 0e 19 ae b0 |!)... ..|. . ....|
|00002e70| 0e 0c 0e 0e ae 82 0e 20 | 3d ae a5 0e 0d 0e 0e ae |....... |=.......|
|00002e80| 82 0e 20 3d ae 9a e1 0e | 0c 21 3f ae 93 e1 0e 0d |.. =....|.!?.....|
|00002e90| 21 3f ae 8c 0e 0c 0e 0d | 3d ad 85 e1 0e 0e 21 3f |!?......|=.....!?|
|00002ea0| 89 1e 5c 22 3f ad 85 0e | 0c 0e 0d 3d 1e 23 70 1e |..\"?...|...=.#p.|
|00002eb0| 0f 0e 10 ab 99 d1 0e 10 | 21 ab 93 d2 d1 0e 10 21 |........|!......!|
|00002ec0| 21 ab 8b e4 8e 0e 10 71 | 88 0e 25 29 aa 89 0e 15 |!......q|..%)....|
|00002ed0| d6 3d ae 83 d7 d8 21 29 | 1e 26 e7 1e 28 e7 1e 29 |.=....!)|.&..(..)|
|00002ee0| e7 1e 2a e7 1e 2b e7 1e | 2c ed 0e 06 21 ab 9b 0e |..*..+..|,...!...|
|00002ef0| 5c 22 ac 97 0e 23 ac 93 | ee 0e 06 21 88 ef 20 88 |\"...#..|...!.. .|
|00002f00| f0 0d 21 88 dd 20 16 06 | f1 16 2a ed 0e 08 21 ab |..!.. ..|..*...!.|
|00002f10| 98 0e 5c 22 ac 94 ee 0e | 08 21 88 ef 20 88 f0 0e |..\"....|.!.. ...|
|00002f20| 07 21 88 dd 20 16 08 f1 | 16 2b ed 0e 5c 6e 21 ab |.!.. ...|.+..\n!.|
|00002f30| 98 0e 5c 22 ac 94 ee 0e | 5c 6e 21 88 ef 20 88 f0 |..\"....|\n!.. ..|
|00002f40| 0e 09 21 88 dd 20 16 5c | 6e f1 16 2c 0e 23 ab ae |..!.. .\|n..,.#..|
|00002f50| f2 0e 0c 21 88 f0 0d 21 | 88 ef 20 88 dd 20 16 06 |...!...!|.. .. ..|
|00002f60| 0e 1c 20 88 dd 20 0e 06 | 3d ab 84 f3 f4 21 88 f0 |.. .. ..|=....!..|
|00002f70| 0e 07 21 88 dd 20 16 08 | f1 16 2a f1 16 2b 0e 5c |..!.. ..|..*..+.\|
|00002f80| 22 83 43 02 df 20 c2 1b | 1e 35 c0 20 88 0e 35 df |".C.. ..|.5. ..5.|
|00002f90| 20 3d ac 8d e7 16 06 e7 | 16 08 e7 16 5c 6e dd 20 | =......|....\n. |
|00002fa0| 16 1e 0e 06 ab 87 ee 0e | 06 21 88 aa 9b 0e 08 ab |........|.!......|
|00002fb0| 87 ee 0e 08 21 88 aa 90 | 0e 5c 6e ab 87 ee 0e 5c |....!...|.\n....\|
|00002fc0| 6e 21 88 aa 85 ee 0e 1e | 21 88 ef 20 88 c2 f6 f7 |n!......|!.. ....|
|00002fd0| 20 0e 26 5f 21 5d 16 28 | f0 0d 21 88 dd 20 16 06 | .&_!].(|..!.. ..|
|00002fe0| f8 c2 f7 20 0e 28 5a 5d | 21 88 dd 20 0e 06 3d ab |... .(Z]|!.. ..=.|
|00002ff0| 84 f3 f4 21 88 dd 20 16 | 5c 6e f0 0e 09 21 88 ee |...!.. .|\n...!..|
|00003000| 0e 06 21 88 0e 1c 20 88 | dd 20 0e 06 3d ab 84 f3 |..!... .|. ..=...|
|00003010| f4 21 88 f0 0e 07 21 88 | dd 20 16 08 f1 16 2a f1 |.!....!.|. ....*.|
|00003020| 16 2b f1 16 2c 2a 0e 2a | ac 90 ee 0e 1e 21 88 ef |.+..,*.*|.....!..|
|00003030| 20 88 f0 0d 21 88 dd 20 | 16 06 0e 2b ac 91 ee 0e | ...!.. |...+....|
|00003040| 1e 21 88 ef 20 88 f0 0e | 07 21 88 dd 20 16 08 0e |.!.. ...|.!.. ...|
|00003050| 2c ac 91 ee 0e 1e 21 88 | ef 20 88 f0 0e 09 21 88 |,.....!.|. ....!.|
|00003060| dd 20 16 5c 6e 70 1e 0f | 0e 10 ab b1 d1 0e 10 21 |. .\np..|.......!|
|00003070| ab ab d2 d1 0e 10 21 21 | ab a3 f9 8e 0e 10 71 88 |......!!|......q.|
|00003080| 0e 06 16 3a 0e 08 16 3b | 0e 5c 6e 16 3c cb 0e 3a |...:...;|.\n.<..:|
|00003090| 21 16 0c cb fd 0e 0c 21 | 21 16 29 29 aa 8a 0e 15 |!......!|!.))....|
|000030a0| d6 3d ac 84 d7 d8 21 88 | 29 fe 0e 10 0e 29 5c 22 |.=....!.|)....)\"|
|000030b0| 2e 13 87 22 20 5b 65 64 | 69 66 66 2d 73 6b 69 70 |..." [ed|iff-skip|
|000030c0| 2d 75 6e 73 75 69 74 61 | 62 6c 65 2d 66 72 61 6d |-unsuita|ble-fram|
|000030d0| 65 73 20 6f 6b 2d 75 6e | 73 70 6c 69 74 74 61 62 |es ok-un|splittab|
|000030e0| 6c 65 20 32 20 77 69 6e | 64 6f 77 2d 6d 69 6e 2d |le 2 win|dow-min-|
|000030f0| 68 65 69 67 68 74 20 65 | 64 69 66 66 2d 67 65 74 |height e|diff-get|
|00003100| 2d 76 69 73 69 62 6c 65 | 2d 62 75 66 66 65 72 2d |-visible|-buffer-|
|00003110| 77 69 6e 64 6f 77 20 62 | 75 66 2d 41 20 77 69 6e |window b|uf-A win|
|00003120| 64 2d 41 20 62 75 66 2d | 42 20 77 69 6e 64 2d 42 |d-A buf-|B wind-B|
|00003130| 20 62 75 66 2d 43 20 77 | 69 6e 64 2d 43 20 77 69 | buf-C w|ind-C wi|
|00003140| 6e 64 6f 77 2d 66 72 61 | 6d 65 20 66 72 61 6d 65 |ndow-fra|me frame|
|00003150| 2d 41 20 66 72 61 6d 65 | 2d 42 20 66 72 61 6d 65 |-A frame|-B frame|
|00003160| 2d 43 20 53 74 61 72 74 | 42 75 66 66 65 72 20 63 |-C Start|Buffer c|
|00003170| 6f 6e 74 72 6f 6c 2d 62 | 75 66 20 67 65 74 2d 62 |ontrol-b|uf get-b|
|00003180| 75 66 66 65 72 20 62 75 | 66 66 65 72 2d 6e 61 6d |uffer bu|ffer-nam|
|00003190| 65 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |e ((set-|buffer S|
|000031a0| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 65 64 69 |tartBuff|er)) edi|
|000031b0| 66 66 2d 77 69 64 65 2d | 64 69 73 70 6c 61 79 2d |ff-wide-|display-|
|000031c0| 70 20 74 68 69 73 2d 63 | 6f 6d 6d 61 6e 64 20 65 |p this-c|ommand e|
|000031d0| 64 69 66 66 2d 71 75 69 | 74 20 65 72 72 6f 72 20 |diff-qui|t error |
|000031e0| 22 59 6f 75 27 76 65 20 | 6b 69 6c 6c 65 64 20 61 |"You've |killed a|
|000031f0| 6e 20 65 73 73 65 6e 74 | 69 61 6c 20 45 64 69 66 |n essent|ial Edif|
|00003200| 66 20 62 75 66 66 65 72 | 2d 2d 2d 50 6c 65 61 73 |f buffer|---Pleas|
|00003210| 65 20 71 75 69 74 20 45 | 64 69 66 66 22 20 66 6f |e quit E|diff" fo|
|00003220| 72 63 65 2d 6f 6e 65 2d | 66 72 61 6d 65 20 28 28 |rce-one-|frame ((|
|00003230| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|00003240| 42 75 66 66 65 72 29 29 | 20 65 64 69 66 66 2d 73 |Buffer))| ediff-s|
|00003250| 70 6c 69 74 2d 77 69 6e | 64 6f 77 2d 66 75 6e 63 |plit-win|dow-func|
|00003260| 74 69 6f 6e 20 73 70 6c | 69 74 2d 77 69 6e 64 6f |tion spl|it-windo|
|00003270| 77 2d 66 75 6e 63 74 69 | 6f 6e 20 73 65 6c 65 63 |w-functi|on selec|
|00003280| 74 65 64 2d 77 69 6e 64 | 6f 77 20 6f 72 69 67 2d |ted-wind|ow orig-|
|00003290| 77 69 6e 64 20 73 65 6c | 65 63 74 65 64 2d 66 72 |wind sel|ected-fr|
|000032a0| 61 6d 65 20 6f 72 69 67 | 2d 66 72 61 6d 65 20 66 |ame orig|-frame f|
|000032b0| 72 61 6d 65 2d 6c 69 76 | 65 2d 70 20 75 73 65 2d |rame-liv|e-p use-|
|000032c0| 73 61 6d 65 2d 66 72 61 | 6d 65 20 75 73 65 2d 73 |same-fra|me use-s|
|000032d0| 61 6d 65 2d 66 72 61 6d | 65 2d 66 6f 72 2d 41 42 |ame-fram|e-for-AB|
|000032e0| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|000032f0| 61 72 74 42 75 66 66 65 | 72 29 29 20 65 64 69 66 |artBuffe|r)) edif|
|00003300| 66 2d 6d 65 72 67 65 2d | 77 69 6e 64 6f 77 2d 73 |f-merge-|window-s|
|00003310| 68 61 72 65 20 6d 65 72 | 67 65 2d 77 69 6e 64 6f |hare mer|ge-windo|
|00003320| 77 2d 73 68 61 72 65 20 | 6e 69 6c 20 6d 65 72 67 |w-share |nil merg|
|00003330| 65 2d 77 69 6e 64 6f 77 | 2d 6c 69 6e 65 73 20 64 |e-window|-lines d|
|00003340| 65 73 69 67 6e 61 74 65 | 64 2d 6d 69 6e 69 62 75 |esignate|d-minibu|
|00003350| 66 66 65 72 2d 66 72 61 | 6d 65 20 64 6f 6e 65 2d |ffer-fra|me done-|
|00003360| 41 20 64 6f 6e 65 2d 42 | 20 64 6f 6e 65 2d 43 20 |A done-B| done-C |
|00003370| 77 69 6e 64 6f 77 2d 6c | 69 76 65 2d 70 20 73 65 |window-l|ive-p se|
|00003380| 6c 65 63 74 2d 77 69 6e | 64 6f 77 20 64 65 6c 65 |lect-win|dow dele|
|00003390| 74 65 2d 6f 74 68 65 72 | 2d 77 69 6e 64 6f 77 73 |te-other|-windows|
|000033a0| 20 73 77 69 74 63 68 2d | 74 6f 2d 62 75 66 66 65 | switch-|to-buffe|
|000033b0| 72 20 74 20 73 65 6c 65 | 63 74 2d 66 72 61 6d 65 |r t sele|ct-frame|
|000033c0| 20 6f 74 68 65 72 2d 77 | 69 6e 64 6f 77 20 31 20 | other-w|indow 1 |
|000033d0| 63 75 72 72 2d 66 72 61 | 6d 65 20 72 6f 75 6e 64 |curr-fra|me round|
|000033e0| 20 77 69 6e 64 6f 77 2d | 68 65 69 67 68 74 20 73 | window-|height s|
|000033f0| 70 6c 69 74 2d 77 69 6e | 64 6f 77 2d 76 65 72 74 |plit-win|dow-vert|
|00003400| 69 63 61 6c 6c 79 20 28 | 28 73 65 74 2d 62 75 66 |ically (|(set-buf|
|00003410| 66 65 72 20 53 74 61 72 | 74 42 75 66 66 65 72 29 |fer Star|tBuffer)|
|00003420| 29 20 65 64 69 66 66 2d | 77 69 6e 64 6f 77 2d 41 |) ediff-|window-A|
|00003430| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 2d 42 20 | ediff-w|indow-B |
|00003440| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 2d 43 20 6d |ediff-wi|ndow-C m|
|00003450| 69 6e 69 62 75 66 66 65 | 72 2d 77 69 6e 64 6f 77 |inibuffe|r-window|
|00003460| 20 65 64 69 66 66 2d 73 | 65 74 75 70 2d 63 6f 6e | ediff-s|etup-con|
|00003470| 74 72 6f 6c 2d 66 72 61 | 6d 65 5d 20 35 5d 20 65 |trol-fra|me] 5] e|
|00003480| 64 69 66 66 2d 73 65 74 | 75 70 2d 77 69 6e 64 6f |diff-set|up-windo|
|00003490| 77 73 2d 6d 75 6c 74 69 | 66 72 61 6d 65 2d 63 6f |ws-multi|frame-co|
|000034a0| 6d 70 61 72 65 20 23 5b | 28 62 75 66 2d 41 20 62 |mpare #[|(buf-A b|
|000034b0| 75 66 2d 42 20 62 75 66 | 2d 43 20 63 6f 6e 74 72 |uf-B buf|-C contr|
|000034c0| 6f 6c 2d 62 75 66 29 20 | 22 c0 c1 21 88 c2 1b c4 |ol-buf) |"..!....|
|000034d0| 0d 21 1e 06 c4 0e 07 21 | 1e 08 c4 0e 09 21 1e 5c |.!.....!|.....!.\|
|000034e0| 6e 0e 06 ad 84 cb 0e 06 | 21 1e 0c 0e 08 ad 84 cb |n.......|!.......|
|000034f0| 0e 08 21 1e 0d 0e 5c 6e | ad 84 cb 0e 5c 6e 21 1e |..!...\n|....\n!.|
|00003500| 0e 70 1e 0f 0e 10 ab 9b | d1 0e 10 21 ab 95 d2 d1 |.p......|...!....|
|00003510| 0e 10 21 21 ab 8d d3 8e | 0e 10 71 88 d4 0e 15 21 |..!!....|..q....!|
|00003520| 29 aa 89 0e 16 d7 3d ae | 83 d8 d9 21 29 1e 1a 70 |).....=.|...!)..p|
|00003530| 1e 0f 0e 10 ab 99 d1 0e | 10 21 ab 93 d2 d1 0e 10 |........|.!......|
|00003540| 21 21 ab 8b db 8e 0e 10 | 71 88 0e 1c 29 aa 89 0e |!!......|q...)...|
|00003550| 16 d7 3d ae 83 d8 d9 21 | 29 1e 1d 70 1e 0f 0e 10 |..=....!|)..p....|
|00003560| ab 99 d1 0e 10 21 ab 93 | d2 d1 0e 10 21 21 ab 8b |.....!..|....!!..|
|00003570| de 8e 0e 10 71 88 0e 1f | 29 aa 89 0e 16 d7 3d ae |....q...|).....=.|
|00003580| 83 d8 d9 21 29 1e 20 70 | 1e 0f 0e 10 ab 99 d1 0e |...!). p|........|
|00003590| 10 21 ab 93 d2 d1 0e 10 | 21 21 ab 8b e1 8e 0e 10 |.!......|!!......|
|000035a0| 71 88 0e 5c 22 29 aa 89 | 0e 16 d7 3d ae 83 d8 d9 |q..\")..|...=....|
|000035b0| 21 29 1e 23 e4 20 1e 25 | 0e 1d ae cf 0e 0c 0e 0d |!).#. .%|........|
|000035c0| 3d ae c8 0e 23 ab a3 0e | 0c 0e 0e 3d ae bd 0e 0d |=...#...|...=....|
|000035d0| 0e 0e 3d ae b6 d4 0e 0c | 21 3f ae af d4 0e 0d 21 |..=.....|!?.....!|
|000035e0| 3f ae a8 d4 0e 0e 21 3f | ae a1 d4 0e 0d 21 ac 8b |?.....!?|.....!..|
|000035f0| 0e 1a ae 97 0e 0c e6 20 | 3d ae 90 d4 0e 0c 21 3f |....... |=.....!?|
|00003600| ad 89 0e 1a ae 85 0e 0d | e6 20 3d 1e 27 e8 1e 29 |........|. =.'..)|
|00003610| e8 1e 2a e8 1e 2b e8 1e | 2c e8 1e 2d e8 1e 2e 70 |..*..+..|,..-...p|
|00003620| 1e 0f 0e 10 ab d0 d1 0e | 10 21 ab ca d2 d1 0e 10 |........|.!......|
|00003630| 21 21 ab c2 ef 8e 0e 10 | 71 88 0e 30 40 1e 31 f2 |!!......|q..0@.1.|
|00003640| 0e 31 21 ad 8e 0e 33 ab | 86 f4 0e 31 21 aa 84 f5 |.1!...3.|...1!...|
|00003650| 0e 31 21 29 16 29 0e 30 | 41 40 1e 31 f2 0e 31 21 |.1!).).0|A@.1..1!|
|00003660| ad 8e 0e 33 ab 86 f4 0e | 31 21 aa 84 f5 0e 31 21 |...3....|1!....1!|
|00003670| 29 16 2a 29 aa 8a 0e 16 | d7 3d ac 84 d8 d9 21 88 |).*)....|.=....!.|
|00003680| 29 f6 0e 06 21 ab 97 0e | 27 ac 93 f7 0e 06 21 88 |)...!...|'.....!.|
|00003690| f8 20 88 f9 0d 21 88 e4 | 20 16 06 fa 16 2c f6 0e |. ...!..| ....,..|
|000036a0| 08 21 ab 98 0e 27 ac 94 | f7 0e 08 21 88 f8 20 88 |.!...'..|...!.. .|
|000036b0| f9 0e 07 21 88 e4 20 16 | 08 fa 16 2d f6 0e 5c 6e |...!.. .|...-..\n|
|000036c0| 21 ab 98 0e 27 ac 94 f7 | 0e 5c 6e 21 88 f8 20 88 |!...'...|.\n!.. .|
|000036d0| f9 0e 09 21 88 e4 20 16 | 5c 6e fa 16 2e 0e 27 83 |...!.. .|\n....'.|
|000036e0| c6 02 e6 20 e8 1e 3b 1e | 3c c0 20 88 0e 3c e6 20 |... ..;.|<. ..<. |
|000036f0| 3d ac 8d e8 16 06 e8 16 | 08 e8 16 5c 6e e4 20 16 |=.......|...\n. .|
|00003700| 25 0e 06 ab 87 f7 0e 06 | 21 88 aa 9b 0e 08 ab 87 |%.......|!.......|
|00003710| f7 0e 08 21 88 aa 90 0e | 5c 6e ab 87 f7 0e 5c 6e |...!....|\n....\n|
|00003720| 21 88 aa 85 f7 0e 25 21 | 88 f8 20 88 f9 0d 21 88 |!.....%!|.. ...!.|
|00003730| e4 20 16 06 0e 23 ab 96 | 0e 20 fd 3d ab 86 fe 0e |. ...#..|. .=....|
|00003740| 06 21 aa 84 ff 0e 06 21 | 81 40 00 a5 16 3b 0e 20 |.!.....!|.@...;. |
|00003750| 0e 3b 21 88 e4 20 0e 06 | 3d ab 88 81 41 00 81 42 |.;!.. ..|=...A..B|
|00003760| 00 21 88 f9 0e 07 21 88 | e4 20 16 08 0e 23 ab 9f |.!....!.|. ...#..|
|00003770| 0e 20 20 88 e4 20 0e 06 | 0e 08 44 3e ab 88 81 41 |.  .. ..|..D>...A|
|00003780| 00 81 42 00 21 88 f9 0e | 09 21 88 e4 20 16 5c 6e |..B.!...|.!.. .\n|
|00003790| fa 16 2c fa 16 2d fa 16 | 2e 2a 0e 2c ac 90 f7 0e |..,..-..|.*.,....|
|000037a0| 25 21 88 f8 20 88 f9 0d | 21 88 e4 20 16 06 0e 2d |%!.. ...|!.. ...-|
|000037b0| ac 91 f7 0e 25 21 88 f8 | 20 88 f9 0e 07 21 88 e4 |....%!..| ....!..|
|000037c0| 20 16 08 0e 23 ab 95 0e | 2e ac 91 f7 0e 25 21 88 | ...#...|.....%!.|
|000037d0| f8 20 88 f9 0e 09 21 88 | e4 20 16 5c 6e 70 1e 0f |. ....!.|. .\np..|
|000037e0| 0e 10 ab b5 d1 0e 10 21 | ab af d2 d1 0e 10 21 21 |.......!|......!!|
|000037f0| ab a7 81 43 00 8e 0e 10 | 71 88 0e 06 16 44 0e 08 |...C....|q....D..|
|00003800| 16 45 0e 5c 6e 16 46 cb | 0e 44 21 16 0c cb 81 47 |.E.\n.F.|.D!....G|
|00003810| 00 0e 0c 21 21 16 2b 29 | aa 8a 0e 16 d7 3d ac 84 |...!!.+)|.....=..|
|00003820| d8 d9 21 88 29 0e 48 ab | 92 81 49 00 0e 06 0e 29 |..!.).H.|..I....)|
|00003830| 5c 22 88 81 49 00 0e 08 | 0e 2a 5c 22 88 81 4a 00 |\"..I...|.*\"..J.|
|00003840| 0e 10 0e 2b 5c 22 2e 13 | 87 22 20 5b 65 64 69 66 |...+\"..|." [edif|
|00003850| 66 2d 73 6b 69 70 2d 75 | 6e 73 75 69 74 61 62 6c |f-skip-u|nsuitabl|
|00003860| 65 2d 66 72 61 6d 65 73 | 20 6f 6b 2d 75 6e 73 70 |e-frames| ok-unsp|
|00003870| 6c 69 74 74 61 62 6c 65 | 20 32 20 77 69 6e 64 6f |littable| 2 windo|
|00003880| 77 2d 6d 69 6e 2d 68 65 | 69 67 68 74 20 65 64 69 |w-min-he|ight edi|
|00003890| 66 66 2d 67 65 74 2d 76 | 69 73 69 62 6c 65 2d 62 |ff-get-v|isible-b|
|000038a0| 75 66 66 65 72 2d 77 69 | 6e 64 6f 77 20 62 75 66 |uffer-wi|ndow buf|
|000038b0| 2d 41 20 77 69 6e 64 2d | 41 20 62 75 66 2d 42 20 |-A wind-|A buf-B |
|000038c0| 77 69 6e 64 2d 42 20 62 | 75 66 2d 43 20 77 69 6e |wind-B b|uf-C win|
|000038d0| 64 2d 43 20 77 69 6e 64 | 6f 77 2d 66 72 61 6d 65 |d-C wind|ow-frame|
|000038e0| 20 66 72 61 6d 65 2d 41 | 20 66 72 61 6d 65 2d 42 | frame-A| frame-B|
|000038f0| 20 66 72 61 6d 65 2d 43 | 20 53 74 61 72 74 42 75 | frame-C| StartBu|
|00003900| 66 66 65 72 20 63 6f 6e | 74 72 6f 6c 2d 62 75 66 |ffer con|trol-buf|
|00003910| 20 67 65 74 2d 62 75 66 | 66 65 72 20 62 75 66 66 | get-buf|fer buff|
|00003920| 65 72 2d 6e 61 6d 65 20 | 28 28 73 65 74 2d 62 75 |er-name |((set-bu|
|00003930| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|00003940| 29 29 20 66 72 61 6d 65 | 2d 6c 69 76 65 2d 70 20 |)) frame|-live-p |
|00003950| 65 64 69 66 66 2d 63 6f | 6e 74 72 6f 6c 2d 66 72 |ediff-co|ntrol-fr|
|00003960| 61 6d 65 20 74 68 69 73 | 2d 63 6f 6d 6d 61 6e 64 |ame this|-command|
|00003970| 20 65 64 69 66 66 2d 71 | 75 69 74 20 65 72 72 6f | ediff-q|uit erro|
|00003980| 72 20 22 59 6f 75 27 76 | 65 20 6b 69 6c 6c 65 64 |r "You'v|e killed|
|00003990| 20 61 6e 20 65 73 73 65 | 6e 74 69 61 6c 20 45 64 | an esse|ntial Ed|
|000039a0| 69 66 66 20 62 75 66 66 | 65 72 2d 2d 2d 50 6c 65 |iff buff|er---Ple|
|000039b0| 61 73 65 20 71 75 69 74 | 20 45 64 69 66 66 22 20 |ase quit| Ediff" |
|000039c0| 63 74 6c 2d 66 72 61 6d | 65 2d 65 78 69 73 74 73 |ctl-fram|e-exists|
|000039d0| 2d 70 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |-p ((set|-buffer |
|000039e0| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 65 64 |StartBuf|fer)) ed|
|000039f0| 69 66 66 2d 77 69 64 65 | 2d 64 69 73 70 6c 61 79 |iff-wide|-display|
|00003a00| 2d 70 20 66 6f 72 63 65 | 2d 6f 6e 65 2d 66 72 61 |-p force|-one-fra|
|00003a10| 6d 65 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |me ((set|-buffer |
|00003a20| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 65 64 |StartBuf|fer)) ed|
|00003a30| 69 66 66 2d 73 70 6c 69 | 74 2d 77 69 6e 64 6f 77 |iff-spli|t-window|
|00003a40| 2d 66 75 6e 63 74 69 6f | 6e 20 73 70 6c 69 74 2d |-functio|n split-|
|00003a50| 77 69 6e 64 6f 77 2d 66 | 75 6e 63 74 69 6f 6e 20 |window-f|unction |
|00003a60| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|00003a70| 72 74 42 75 66 66 65 72 | 29 29 20 65 64 69 66 66 |rtBuffer|)) ediff|
|00003a80| 2d 33 77 61 79 2d 63 6f | 6d 70 61 72 69 73 6f 6e |-3way-co|mparison|
|00003a90| 2d 6a 6f 62 20 74 68 72 | 65 65 2d 77 61 79 2d 63 |-job thr|ee-way-c|
|00003aa0| 6f 6d 70 61 72 69 73 6f | 6e 20 73 65 6c 65 63 74 |ompariso|n select|
|00003ab0| 65 64 2d 77 69 6e 64 6f | 77 20 6f 72 69 67 2d 77 |ed-windo|w orig-w|
|00003ac0| 69 6e 64 20 73 65 6c 65 | 63 74 65 64 2d 66 72 61 |ind sele|cted-fra|
|00003ad0| 6d 65 20 75 73 65 2d 73 | 61 6d 65 2d 66 72 61 6d |me use-s|ame-fram|
|00003ae0| 65 20 6e 69 6c 20 77 69 | 6e 64 2d 41 2d 73 74 61 |e nil wi|nd-A-sta|
|00003af0| 72 74 20 77 69 6e 64 2d | 42 2d 73 74 61 72 74 20 |rt wind-|B-start |
|00003b00| 64 65 73 69 67 6e 61 74 | 65 64 2d 6d 69 6e 69 62 |designat|ed-minib|
|00003b10| 75 66 66 65 72 2d 66 72 | 61 6d 65 20 64 6f 6e 65 |uffer-fr|ame done|
|00003b20| 2d 41 20 64 6f 6e 65 2d | 42 20 64 6f 6e 65 2d 43 |-A done-|B done-C|
|00003b30| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|00003b40| 61 72 74 42 75 66 66 65 | 72 29 29 20 65 64 69 66 |artBuffe|r)) edif|
|00003b50| 66 2d 6e 61 72 72 6f 77 | 2d 62 6f 75 6e 64 73 20 |f-narrow|-bounds |
|00003b60| 6f 76 65 72 6c 20 65 64 | 69 66 66 2d 6f 76 65 72 |overl ed|iff-over|
|00003b70| 6c 61 79 70 20 65 64 69 | 66 66 2d 65 6d 61 63 73 |layp edi|ff-emacs|
|00003b80| 2d 70 20 6f 76 65 72 6c | 61 79 2d 73 74 61 72 74 |-p overl|ay-start|
|00003b90| 20 65 78 74 65 6e 74 2d | 73 74 61 72 74 2d 70 6f | extent-|start-po|
|00003ba0| 73 69 74 69 6f 6e 20 77 | 69 6e 64 6f 77 2d 6c 69 |sition w|indow-li|
|00003bb0| 76 65 2d 70 20 73 65 6c | 65 63 74 2d 77 69 6e 64 |ve-p sel|ect-wind|
|00003bc0| 6f 77 20 64 65 6c 65 74 | 65 2d 6f 74 68 65 72 2d |ow delet|e-other-|
|00003bd0| 77 69 6e 64 6f 77 73 20 | 73 77 69 74 63 68 2d 74 |windows |switch-t|
|00003be0| 6f 2d 62 75 66 66 65 72 | 20 74 20 77 69 6e 64 2d |o-buffer| t wind-|
|00003bf0| 77 69 64 74 68 2d 6f 72 | 2d 68 65 69 67 68 74 20 |width-or|-height |
|00003c00| 63 75 72 72 2d 66 72 61 | 6d 65 20 73 70 6c 69 74 |curr-fra|me split|
|00003c10| 2d 77 69 6e 64 6f 77 2d | 76 65 72 74 69 63 61 6c |-window-|vertical|
|00003c20| 6c 79 20 77 69 6e 64 6f | 77 2d 68 65 69 67 68 74 |ly windo|w-height|
|00003c30| 20 77 69 6e 64 6f 77 2d | 77 69 64 74 68 20 33 20 | window-|width 3 |
|00003c40| 6f 74 68 65 72 2d 77 69 | 6e 64 6f 77 20 31 20 28 |other-wi|ndow 1 (|
|00003c50| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|00003c60| 74 42 75 66 66 65 72 29 | 29 20 65 64 69 66 66 2d |tBuffer)|) ediff-|
|00003c70| 77 69 6e 64 6f 77 2d 41 | 20 65 64 69 66 66 2d 77 |window-A| ediff-w|
|00003c80| 69 6e 64 6f 77 2d 42 20 | 65 64 69 66 66 2d 77 69 |indow-B |ediff-wi|
|00003c90| 6e 64 6f 77 2d 43 20 6d | 69 6e 69 62 75 66 66 65 |ndow-C m|inibuffe|
|00003ca0| 72 2d 77 69 6e 64 6f 77 | 20 65 64 69 66 66 2d 77 |r-window| ediff-w|
|00003cb0| 69 6e 64 6f 77 73 2d 6a | 6f 62 20 73 65 74 2d 77 |indows-j|ob set-w|
|00003cc0| 69 6e 64 6f 77 2d 73 74 | 61 72 74 20 65 64 69 66 |indow-st|art edif|
|00003cd0| 66 2d 73 65 74 75 70 2d | 63 6f 6e 74 72 6f 6c 2d |f-setup-|control-|
|00003ce0| 66 72 61 6d 65 5d 20 33 | 5d 20 65 64 69 66 66 2d |frame] 3|] ediff-|
|00003cf0| 73 6b 69 70 2d 75 6e 73 | 75 69 74 61 62 6c 65 2d |skip-uns|uitable-|
|00003d00| 66 72 61 6d 65 73 20 23 | 5b 28 26 6f 70 74 69 6f |frames #|[(&optio|
|00003d10| 6e 61 6c 20 6f 6b 2d 75 | 6e 73 70 6c 69 74 74 61 |nal ok-u|nsplitta|
|00003d20| 62 6c 65 29 20 22 c0 20 | ad e1 c0 20 c1 3e 3f ad |ble) ". |... .>?.|
|00003d30| da c2 1b c4 20 0b 3d ac | c6 c5 c4 20 21 ac b3 c6 |.... .=.|... !...|
|00003d40| 20 1e 07 c8 20 ad 96 c9 | 0e 07 21 ad 90 0e 5c 6e | ... ...|..!...\n|
|00003d50| ab 86 cb 0e 07 21 aa 86 | cc 0e 07 21 cd 3d 29 ac |.....!..|...!.=).|
|00003d60| 92 0e 0e ac 9b c6 20 1e | 07 cf d0 0e 07 21 9e 41 |...... .|.....!.A|
|00003d70| 29 ab 8d 0b ac 83 c4 20 | 13 d1 d2 d3 5c 22 88 aa |)...... |....\"..|
|00003d80| 34 c4 20 0b 3d ad 85 d4 | d5 d6 21 21 29 87 22 20 |4. .=...|..!!)." |
|00003d90| 5b 65 64 69 66 66 2d 64 | 65 76 69 63 65 2d 74 79 |[ediff-d|evice-ty|
|00003da0| 70 65 20 28 74 74 79 20 | 73 74 72 65 61 6d 29 20 |pe (tty |stream) |
|00003db0| 6e 69 6c 20 6c 61 73 74 | 2d 77 69 6e 64 6f 77 20 |nil last|-window |
|00003dc0| 73 65 6c 65 63 74 65 64 | 2d 77 69 6e 64 6f 77 20 |selected|-window |
|00003dd0| 77 69 6e 64 6f 77 2d 64 | 65 64 69 63 61 74 65 64 |window-d|edicated|
|00003de0| 2d 70 20 73 65 6c 65 63 | 74 65 64 2d 66 72 61 6d |-p selec|ted-fram|
|00003df0| 65 20 66 72 61 6d 65 20 | 65 64 69 66 66 2d 77 69 |e frame |ediff-wi|
|00003e00| 6e 64 6f 77 2d 64 69 73 | 70 6c 61 79 2d 70 20 66 |ndow-dis|play-p f|
|00003e10| 72 61 6d 65 2d 6c 69 76 | 65 2d 70 20 65 64 69 66 |rame-liv|e-p edif|
|00003e20| 66 2d 78 65 6d 61 63 73 | 2d 70 20 66 72 61 6d 65 |f-xemacs|-p frame|
|00003e30| 2d 69 63 6f 6e 69 66 69 | 65 64 2d 70 20 66 72 61 |-iconifi|ed-p fra|
|00003e40| 6d 65 2d 76 69 73 69 62 | 6c 65 2d 70 20 69 63 6f |me-visib|le-p ico|
|00003e50| 6e 20 6f 6b 2d 75 6e 73 | 70 6c 69 74 74 61 62 6c |n ok-uns|plittabl|
|00003e60| 65 20 75 6e 73 70 6c 69 | 74 74 61 62 6c 65 20 66 |e unspli|ttable f|
|00003e70| 72 61 6d 65 2d 70 61 72 | 61 6d 65 74 65 72 73 20 |rame-par|ameters |
|00003e80| 6f 74 68 65 72 2d 77 69 | 6e 64 6f 77 20 31 20 74 |other-wi|ndow 1 t|
|00003e90| 20 73 65 6c 65 63 74 2d | 66 72 61 6d 65 20 6d 61 | select-|frame ma|
|00003ea0| 6b 65 2d 66 72 61 6d 65 | 20 28 28 75 6e 73 70 6c |ke-frame| ((unspl|
|00003eb0| 69 74 74 61 62 6c 65 29 | 29 5d 20 33 5d 20 65 64 |ittable)|)] 3] ed|
|00003ec0| 69 66 66 2d 73 65 74 75 | 70 2d 63 6f 6e 74 72 6f |iff-setu|p-contro|
|00003ed0| 6c 2d 66 72 61 6d 65 20 | 23 5b 28 63 74 6c 2d 62 |l-frame |#[(ctl-b|
|00003ee0| 75 66 66 65 72 20 64 65 | 73 69 67 6e 61 74 65 64 |uffer de|signated|
|00003ef0| 2d 6d 69 6e 69 62 75 66 | 66 65 72 2d 66 72 61 6d |-minibuf|fer-fram|
|00003f00| 65 29 20 22 c0 c1 89 89 | 89 89 89 89 89 89 1a 1b |e) "....|........|
|00003f10| 1c 1d 1e 06 1e 07 1e 08 | 1e 09 1e 5c 6e 1e 0b 70 |........|...\n..p|
|00003f20| 1e 0c 0e 0d ab a3 ce 0e | 0d 21 ab 9d cf ce 0e 0d |........|.!......|
|00003f30| 21 21 ab 95 d0 8e 0e 0d | 71 88 0e 11 ab 84 d2 c1 |!!......|q.......|
|00003f40| 21 88 d3 d4 21 88 29 aa | 8a 0e 15 d6 3d ac 84 d7 |!...!.).|....=...|
|00003f50| d8 21 88 29 70 1e 0c 0e | 0d ab 99 ce 0e 0d 21 ab |.!.)p...|......!.|
|00003f60| 93 cf ce 0e 0d 21 21 ab | 8b d9 8e 0e 0d 71 88 0e |.....!!.|.....q..|
|00003f70| 1a 29 aa 89 0e 15 d6 3d | ae 83 d7 d8 21 29 16 06 |.).....=|....!)..|
|00003f80| db 0e 06 21 ab 85 dc 0e | 06 21 88 70 1e 0c 0e 0d |...!....|.!.p....|
|00003f90| ab a4 ce 0e 0d 21 ab 9e | cf ce 0e 0d 21 21 ab 96 |.....!..|....!!..|
|00003fa0| dd 8e 0e 0d 71 88 0e 1e | 1e 1f e0 0e 21 21 89 16 |....q...|....!!..|
|00003fb0| 07 16 1a 2a aa 8a 0e 15 | d6 3d ac 84 d7 d8 21 88 |...*....|.=....!.|
|00003fc0| 29 0e 07 1e 5c 22 e3 20 | ad 96 db 0e 5c 22 21 ad |)...\". |....\"!.|
|00003fd0| 90 0e 11 ab 86 e4 0e 5c | 22 21 aa 86 e5 0e 5c 22 |.......\|"!....\"|
|00003fe0| 21 e6 3d 29 16 5c 6e e7 | 0e 07 21 88 e8 e9 20 21 |!.=).\n.|..!... !|
|00003ff0| ac 88 ea 20 88 eb 0e 0d | 21 88 70 1e 0c 0e 0d ab |... ....|!.p.....|
|00004000| a3 ce 0e 0d 21 ab 9d cf | ce 0e 0d 21 21 ab 95 ec |....!...|...!!...|
|00004010| 8e 0e 0d 71 88 ed ee 21 | 88 ed ef 21 88 ed f0 21 |...q...!|...!...!|
|00004020| 88 29 aa 8a 0e 15 d6 3d | ac 84 d7 d8 21 88 29 f1 |.).....=|....!.).|
|00004030| 0e 0d 21 88 0e 32 0e 33 | 98 3f 16 09 0e 15 f4 3d |..!..2.3|.?.....=|
|00004040| ad 82 0e 09 16 08 0e 11 | ab 88 f5 65 64 5c 22 c0 |........|...ed\".|
|00004050| 5c 5c aa 85 f5 65 64 5c | 22 54 89 15 14 f6 20 c0 |\\...ed\|"T.... .|
|00004060| 5c 5c 13 f7 f8 f9 0b 42 | fa 0c 42 45 0e 3b 0e 0d |\\.....B|..BE.;..|
|00004070| 0b 0c 23 5c 22 12 0e 3c | ab 84 fd 5c 6e 42 12 0e |..#\"..<|...\nB..|
|00004080| 11 ab ac fe 0e 3f 0e 07 | 81 40 00 44 5c 22 88 fe |.....?..|.@.D\"..|
|00004090| 0e 41 0e 07 81 40 00 44 | 5c 22 88 fe 0e 42 0e 07 |.A...@.D|\"...B..|
|000040a0| 81 40 00 44 5c 22 88 fe | 0e 43 0e 07 81 40 00 44 |.@.D\"..|.C...@.D|
|000040b0| 5c 22 88 0e 44 81 45 00 | 3d ab 88 81 46 00 0e 07 |\"..D.E.|=...F...|
|000040c0| 5c 6e 5c 22 88 65 62 88 | 81 46 00 0e 07 5c 6e 5c |\n\".eb.|.F...\n\|
|000040d0| 22 88 e7 0e 07 21 88 81 | 47 00 20 88 0e 48 ab 91 |"....!..|G. ..H..|
|000040e0| 0e 5c 6e ac 8d 0e 09 ac | 89 81 49 00 0e 07 21 88 |.\n.....|..I...!.|
|000040f0| aa 8f 0e 08 ac 84 0e 5c | 6e ac 87 81 4a 00 0e 07 |.......\|n...J...|
|00004100| 21 88 0e 11 ab 8b 81 4b | 00 e9 20 0e 0d 5c 22 88 |!......K|.. ..\".|
|00004110| aa 8a 81 4c 00 e9 20 81 | 4d 00 5c 22 88 81 4e 00 |...L.. .|M.\"..N.|
|00004120| 1e 4f 81 50 00 81 51 00 | 21 88 e5 0e 07 21 ac 97 |.O.P..Q.|!....!..|
|00004130| 0e 4f 81 40 00 56 ab 8f | 0e 4f 53 16 4f 81 50 00 |.O.@.V..|.OS.O.P.|
|00004140| 81 52 00 21 88 aa 63 29 | 81 53 00 0e 07 21 ac 87 |.R.!..c)|.S...!..|
|00004150| 81 54 00 0e 07 21 88 0e | 11 ab bc 70 1e 0c 0e 0d |.T...!..|...p....|
|00004160| ab aa ce 0e 0d 21 ab a4 | cf ce 0e 0d 21 21 ab 9c |.....!..|....!!..|
|00004170| 81 55 00 8e 0e 0d 71 88 | ed 81 56 00 21 88 81 57 |.U....q.|..V.!..W|
|00004180| 00 81 56 00 81 58 00 5c | 22 88 29 aa 8a 0e 15 d6 |..V..X.\|".).....|
|00004190| 3d ac 84 d7 d8 21 88 29 | 70 1e 0c 0e 0d ab 9e ce |=....!.)|p.......|
|000041a0| 0e 0d 21 ab 98 cf ce 0e | 0d 21 21 ab 90 81 59 00 |..!.....|.!!...Y.|
|000041b0| 8e 0e 0d 71 88 d3 81 5a | 00 21 29 aa 89 0e 15 d6 |...q...Z|.!).....|
|000041c0| 3d ae 83 d7 d8 21 2e 0b | 87 22 20 5b 32 20 6e 69 |=....!..|." [2 ni|
|000041d0| 6c 20 61 64 6a 75 73 74 | 65 64 2d 70 61 72 61 6d |l adjust|ed-param|
|000041e0| 65 74 65 72 73 20 66 77 | 69 64 74 68 20 66 68 65 |eters fw|idth fhe|
|000041f0| 69 67 68 74 20 6c 69 6e | 65 73 20 6f 6c 64 2d 63 |ight lin|es old-c|
|00004200| 74 6c 2d 66 72 61 6d 65 | 20 63 74 6c 2d 66 72 61 |tl-frame| ctl-fra|
|00004210| 6d 65 20 64 65 69 63 6f | 6e 69 66 79 2d 63 74 6c |me deico|nify-ctl|
|00004220| 2d 66 72 61 6d 65 20 64 | 6f 6e 74 2d 69 63 6f 6e |-frame d|ont-icon|
|00004230| 69 66 79 2d 63 74 6c 2d | 66 72 61 6d 65 20 63 74 |ify-ctl-|frame ct|
|00004240| 6c 2d 66 72 61 6d 65 2d | 69 63 6f 6e 69 66 69 65 |l-frame-|iconifie|
|00004250| 64 2d 70 20 77 69 6e 64 | 6f 77 2d 6d 69 6e 2d 68 |d-p wind|ow-min-h|
|00004260| 65 69 67 68 74 20 53 74 | 61 72 74 42 75 66 66 65 |eight St|artBuffe|
|00004270| 72 20 63 74 6c 2d 62 75 | 66 66 65 72 20 67 65 74 |r ctl-bu|ffer get|
|00004280| 2d 62 75 66 66 65 72 20 | 62 75 66 66 65 72 2d 6e |-buffer |buffer-n|
|00004290| 61 6d 65 20 28 28 73 65 | 74 2d 62 75 66 66 65 72 |ame ((se|t-buffer|
|000042a0| 20 53 74 61 72 74 42 75 | 66 66 65 72 29 29 20 65 | StartBu|ffer)) e|
|000042b0| 64 69 66 66 2d 78 65 6d | 61 63 73 2d 70 20 73 65 |diff-xem|acs-p se|
|000042c0| 74 2d 62 75 66 66 65 72 | 2d 6d 65 6e 75 62 61 72 |t-buffer|-menubar|
|000042d0| 20 72 75 6e 2d 68 6f 6f | 6b 73 20 65 64 69 66 66 | run-hoo|ks ediff|
|000042e0| 2d 62 65 66 6f 72 65 2d | 73 65 74 75 70 2d 63 6f |-before-|setup-co|
|000042f0| 6e 74 72 6f 6c 2d 66 72 | 61 6d 65 2d 68 6f 6f 6b |ntrol-fr|ame-hook|
|00004300| 73 20 74 68 69 73 2d 63 | 6f 6d 6d 61 6e 64 20 65 |s this-c|ommand e|
|00004310| 64 69 66 66 2d 71 75 69 | 74 20 65 72 72 6f 72 20 |diff-qui|t error |
|00004320| 22 59 6f 75 27 76 65 20 | 6b 69 6c 6c 65 64 20 61 |"You've |killed a|
|00004330| 6e 20 65 73 73 65 6e 74 | 69 61 6c 20 45 64 69 66 |n essent|ial Edif|
|00004340| 66 20 62 75 66 66 65 72 | 2d 2d 2d 50 6c 65 61 73 |f buffer|---Pleas|
|00004350| 65 20 71 75 69 74 20 45 | 64 69 66 66 22 20 28 28 |e quit E|diff" ((|
|00004360| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|00004370| 42 75 66 66 65 72 29 29 | 20 65 64 69 66 66 2d 63 |Buffer))| ediff-c|
|00004380| 6f 6e 74 72 6f 6c 2d 66 | 72 61 6d 65 20 66 72 61 |ontrol-f|rame fra|
|00004390| 6d 65 2d 6c 69 76 65 2d | 70 20 64 65 6c 65 74 65 |me-live-|p delete|
|000043a0| 2d 66 72 61 6d 65 20 28 | 28 73 65 74 2d 62 75 66 |-frame (|(set-buf|
|000043b0| 66 65 72 20 53 74 61 72 | 74 42 75 66 66 65 72 29 |fer Star|tBuffer)|
|000043c0| 29 20 64 65 73 69 67 6e | 61 74 65 64 2d 6d 69 6e |) design|ated-min|
|000043d0| 69 62 75 66 66 65 72 2d | 66 72 61 6d 65 20 64 65 |ibuffer-|frame de|
|000043e0| 66 61 75 6c 74 2d 6d 69 | 6e 69 62 75 66 66 65 72 |fault-mi|nibuffer|
|000043f0| 2d 66 72 61 6d 65 20 6d | 61 6b 65 2d 66 72 61 6d |-frame m|ake-fram|
|00004400| 65 20 65 64 69 66 66 2d | 63 6f 6e 74 72 6f 6c 2d |e ediff-|control-|
|00004410| 66 72 61 6d 65 2d 70 61 | 72 61 6d 65 74 65 72 73 |frame-pa|rameters|
|00004420| 20 66 72 61 6d 65 20 65 | 64 69 66 66 2d 77 69 6e | frame e|diff-win|
|00004430| 64 6f 77 2d 64 69 73 70 | 6c 61 79 2d 70 20 66 72 |dow-disp|lay-p fr|
|00004440| 61 6d 65 2d 69 63 6f 6e | 69 66 69 65 64 2d 70 20 |ame-icon|ified-p |
|00004450| 66 72 61 6d 65 2d 76 69 | 73 69 62 6c 65 2d 70 20 |frame-vi|sible-p |
|00004460| 69 63 6f 6e 20 73 65 6c | 65 63 74 2d 66 72 61 6d |icon sel|ect-fram|
|00004470| 65 20 77 69 6e 64 6f 77 | 2d 64 65 64 69 63 61 74 |e window|-dedicat|
|00004480| 65 64 2d 70 20 73 65 6c | 65 63 74 65 64 2d 77 69 |ed-p sel|ected-wi|
|00004490| 6e 64 6f 77 20 64 65 6c | 65 74 65 2d 6f 74 68 65 |ndow del|ete-othe|
|000044a0| 72 2d 77 69 6e 64 6f 77 | 73 20 73 77 69 74 63 68 |r-window|s switch|
|000044b0| 2d 74 6f 2d 62 75 66 66 | 65 72 20 28 28 73 65 74 |-to-buff|er ((set|
|000044c0| 2d 62 75 66 66 65 72 20 | 53 74 61 72 74 42 75 66 |-buffer |StartBuf|
|000044d0| 66 65 72 29 29 20 6d 61 | 6b 65 2d 6c 6f 63 61 6c |fer)) ma|ke-local|
|000044e0| 2d 76 61 72 69 61 62 6c | 65 20 66 72 61 6d 65 2d |-variabl|e frame-|
|000044f0| 74 69 74 6c 65 2d 66 6f | 72 6d 61 74 20 66 72 61 |title-fo|rmat fra|
|00004500| 6d 65 2d 69 63 6f 6e 2d | 74 69 74 6c 65 2d 66 6f |me-icon-|title-fo|
|00004510| 72 6d 61 74 20 69 63 6f | 6e 2d 74 69 74 6c 65 2d |rmat ico|n-title-|
|00004520| 66 6f 72 6d 61 74 20 65 | 64 69 66 66 2d 73 65 74 |format e|diff-set|
|00004530| 75 70 2d 63 6f 6e 74 72 | 6f 6c 2d 62 75 66 66 65 |up-contr|ol-buffe|
|00004540| 72 20 65 64 69 66 66 2d | 68 65 6c 70 2d 6d 65 73 |r ediff-|help-mes|
|00004550| 73 61 67 65 20 65 64 69 | 66 66 2d 62 72 69 65 66 |sage edi|ff-brief|
|00004560| 2d 68 65 6c 70 2d 6d 65 | 73 73 61 67 65 20 65 64 |-help-me|ssage ed|
|00004570| 69 66 66 2d 74 6f 67 67 | 6c 65 2d 68 65 6c 70 20 |iff-togg|le-help |
|00004580| 63 6f 75 6e 74 2d 6c 69 | 6e 65 73 20 65 64 69 66 |count-li|nes edif|
|00004590| 66 2d 68 65 6c 70 2d 6d | 65 73 73 61 67 65 2d 6c |f-help-m|essage-l|
|000045a0| 69 6e 65 2d 6c 65 6e 67 | 74 68 20 61 70 70 65 6e |ine-leng|th appen|
|000045b0| 64 20 28 76 69 73 69 62 | 69 6c 69 74 79 20 2e 20 |d (visib|ility . |
|000045c0| 74 29 20 77 69 64 74 68 | 20 68 65 69 67 68 74 20 |t) width| height |
|000045d0| 65 64 69 66 66 2d 63 6f | 6e 74 72 6f 6c 2d 66 72 |ediff-co|ntrol-fr|
|000045e0| 61 6d 65 2d 70 6f 73 69 | 74 69 6f 6e 2d 66 75 6e |ame-posi|tion-fun|
|000045f0| 63 74 69 6f 6e 20 65 64 | 69 66 66 2d 70 72 65 66 |ction ed|iff-pref|
|00004600| 65 72 2d 6c 6f 6e 67 2d | 68 65 6c 70 2d 6d 65 73 |er-long-|help-mes|
|00004610| 73 61 67 65 20 28 61 75 | 74 6f 2d 72 61 69 73 65 |sage (au|to-raise|
|00004620| 29 20 73 65 74 2d 73 70 | 65 63 69 66 69 65 72 20 |) set-sp|ecifier |
|00004630| 74 6f 70 2d 74 6f 6f 6c | 62 61 72 2d 68 65 69 67 |top-tool|bar-heig|
|00004640| 68 74 20 30 20 62 6f 74 | 74 6f 6d 2d 74 6f 6f 6c |ht 0 bot|tom-tool|
|00004650| 62 61 72 2d 68 65 69 67 | 68 74 20 6c 65 66 74 2d |bar-heig|ht left-|
|00004660| 74 6f 6f 6c 62 61 72 2d | 77 69 64 74 68 20 72 69 |toolbar-|width ri|
|00004670| 67 68 74 2d 74 6f 6f 6c | 62 61 72 2d 77 69 64 74 |ght-tool|bar-widt|
|00004680| 68 20 73 79 73 74 65 6d | 2d 74 79 70 65 20 65 6d |h system|-type em|
|00004690| 78 20 6d 6f 64 69 66 79 | 2d 66 72 61 6d 65 2d 70 |x modify|-frame-p|
|000046a0| 61 72 61 6d 65 74 65 72 | 73 20 65 64 69 66 66 2d |arameter|s ediff-|
|000046b0| 72 65 66 72 65 73 68 2d | 63 6f 6e 74 72 6f 6c 2d |refresh-|control-|
|000046c0| 66 72 61 6d 65 20 65 64 | 69 66 66 2d 70 72 65 66 |frame ed|iff-pref|
|000046d0| 65 72 2d 69 63 6f 6e 69 | 66 69 65 64 2d 63 6f 6e |er-iconi|fied-con|
|000046e0| 74 72 6f 6c 2d 66 72 61 | 6d 65 20 69 63 6f 6e 69 |trol-fra|me iconi|
|000046f0| 66 79 2d 66 72 61 6d 65 | 20 72 61 69 73 65 2d 66 |fy-frame| raise-f|
|00004700| 72 61 6d 65 20 73 65 74 | 2d 77 69 6e 64 6f 77 2d |rame set|-window-|
|00004710| 62 75 66 66 65 72 2d 64 | 65 64 69 63 61 74 65 64 |buffer-d|edicated|
|00004720| 20 73 65 74 2d 77 69 6e | 64 6f 77 2d 64 65 64 69 | set-win|dow-dedi|
|00004730| 63 61 74 65 64 2d 70 20 | 74 20 37 20 63 6f 75 6e |cated-p |t 7 coun|
|00004740| 74 20 73 69 74 2d 66 6f | 72 20 30 2e 31 20 30 2e |t sit-fo|r 0.1 0.|
|00004750| 33 20 65 64 69 66 66 2d | 66 72 61 6d 65 2d 69 63 |3 ediff-|frame-ic|
|00004760| 6f 6e 69 66 69 65 64 2d | 70 20 65 64 69 66 66 2d |onified-|p ediff-|
|00004770| 72 65 73 65 74 2d 6d 6f | 75 73 65 20 28 28 73 65 |reset-mo|use ((se|
|00004780| 74 2d 62 75 66 66 65 72 | 20 53 74 61 72 74 42 75 |t-buffer| StartBu|
|00004790| 66 66 65 72 29 29 20 73 | 65 6c 65 63 74 2d 66 72 |ffer)) s|elect-fr|
|000047a0| 61 6d 65 2d 68 6f 6f 6b | 20 61 64 64 2d 68 6f 6f |ame-hook| add-hoo|
|000047b0| 6b 20 65 64 69 66 66 2d | 78 65 6d 61 63 73 2d 73 |k ediff-|xemacs-s|
|000047c0| 65 6c 65 63 74 2d 66 72 | 61 6d 65 2d 68 6f 6f 6b |elect-fr|ame-hook|
|000047d0| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|000047e0| 61 72 74 42 75 66 66 65 | 72 29 29 20 65 64 69 66 |artBuffe|r)) edif|
|000047f0| 66 2d 61 66 74 65 72 2d | 73 65 74 75 70 2d 63 6f |f-after-|setup-co|
|00004800| 6e 74 72 6f 6c 2d 66 72 | 61 6d 65 2d 68 6f 6f 6b |ntrol-fr|ame-hook|
|00004810| 73 5d 20 31 31 5d 20 65 | 64 69 66 66 2d 64 65 73 |s] 11] e|diff-des|
|00004820| 74 72 6f 79 2d 63 6f 6e | 74 72 6f 6c 2d 66 72 61 |troy-con|trol-fra|
|00004830| 6d 65 20 23 5b 28 63 74 | 6c 2d 62 75 66 66 65 72 |me #[(ct|l-buffer|
|00004840| 29 20 22 70 18 09 ab ba | c2 09 21 ab b5 c3 c2 09 |) "p....|..!.....|
|00004850| 21 21 ab ae c4 8e 09 71 | 88 c5 20 ab a2 c5 20 c6 |!!.....q|.. ... .|
|00004860| 3e ac 9c c7 0e 08 21 ab | 96 0e 08 1e 09 0e 5c 6e |>.....!.|......\n|
|00004870| ab 85 cb 0e 0c 21 88 cd | 16 08 ce 0e 09 21 88 29 |.....!..|.....!.)|
|00004880| 29 aa 8a 0e 0f d0 3d ac | 84 d1 d2 21 88 29 d3 20 |).....=.|...!.). |
|00004890| 88 d4 20 87 22 20 5b 53 | 74 61 72 74 42 75 66 66 |.. ." [S|tartBuff|
|000048a0| 65 72 20 63 74 6c 2d 62 | 75 66 66 65 72 20 67 65 |er ctl-b|uffer ge|
|000048b0| 74 2d 62 75 66 66 65 72 | 20 62 75 66 66 65 72 2d |t-buffer| buffer-|
|000048c0| 6e 61 6d 65 20 28 28 73 | 65 74 2d 62 75 66 66 65 |name ((s|et-buffe|
|000048d0| 72 20 53 74 61 72 74 42 | 75 66 66 65 72 29 29 20 |r StartB|uffer)) |
|000048e0| 65 64 69 66 66 2d 64 65 | 76 69 63 65 2d 74 79 70 |ediff-de|vice-typ|
|000048f0| 65 20 28 74 74 79 20 73 | 74 72 65 61 6d 29 20 66 |e (tty s|tream) f|
|00004900| 72 61 6d 65 2d 6c 69 76 | 65 2d 70 20 65 64 69 66 |rame-liv|e-p edif|
|00004910| 66 2d 63 6f 6e 74 72 6f | 6c 2d 66 72 61 6d 65 20 |f-contro|l-frame |
|00004920| 63 74 6c 2d 66 72 61 6d | 65 20 65 64 69 66 66 2d |ctl-fram|e ediff-|
|00004930| 78 65 6d 61 63 73 2d 70 | 20 73 65 74 2d 62 75 66 |xemacs-p| set-buf|
|00004940| 66 65 72 2d 6d 65 6e 75 | 62 61 72 20 64 65 66 61 |fer-menu|bar defa|
|00004950| 75 6c 74 2d 6d 65 6e 75 | 62 61 72 20 6e 69 6c 20 |ult-menu|bar nil |
|00004960| 64 65 6c 65 74 65 2d 66 | 72 61 6d 65 20 74 68 69 |delete-f|rame thi|
|00004970| 73 2d 63 6f 6d 6d 61 6e | 64 20 65 64 69 66 66 2d |s-comman|d ediff-|
|00004980| 71 75 69 74 20 65 72 72 | 6f 72 20 22 59 6f 75 27 |quit err|or "You'|
|00004990| 76 65 20 6b 69 6c 6c 65 | 64 20 61 6e 20 65 73 73 |ve kille|d an ess|
|000049a0| 65 6e 74 69 61 6c 20 45 | 64 69 66 66 20 62 75 66 |ential E|diff buf|
|000049b0| 66 65 72 2d 2d 2d 50 6c | 65 61 73 65 20 71 75 69 |fer---Pl|ease qui|
|000049c0| 74 20 45 64 69 66 66 22 | 20 65 64 69 66 66 2d 73 |t Ediff"| ediff-s|
|000049d0| 6b 69 70 2d 75 6e 73 75 | 69 74 61 62 6c 65 2d 66 |kip-unsu|itable-f|
|000049e0| 72 61 6d 65 73 20 65 64 | 69 66 66 2d 72 65 73 65 |rames ed|iff-rese|
|000049f0| 74 2d 6d 6f 75 73 65 5d | 20 33 5d 20 65 64 69 66 |t-mouse]| 3] edif|
|00004a00| 66 2d 6d 61 6b 65 2d 66 | 72 61 6d 65 2d 70 6f 73 |f-make-f|rame-pos|
|00004a10| 69 74 69 6f 6e 20 23 5b | 28 63 74 6c 2d 62 75 66 |ition #[|(ctl-buf|
|00004a20| 66 65 72 20 63 74 6c 2d | 66 72 61 6d 65 2d 77 69 |fer ctl-|frame-wi|
|00004a30| 64 74 68 20 63 74 6c 2d | 66 72 61 6d 65 2d 68 65 |dth ctl-|frame-he|
|00004a40| 69 67 68 74 29 20 22 70 | 18 09 83 2c 01 c2 09 21 |ight) "p|...,...!|
|00004a50| 83 2c 01 c3 c2 09 21 21 | 83 2c 01 c4 8e 09 71 88 |.,....!!|.,....q.|
|00004a60| c5 0e 06 21 1e 07 c8 0e | 07 21 1e 09 ca cb cc 0e |...!....|.!......|
|00004a70| 09 5c 22 41 21 1e 0d ca | cb ce 0e 09 5c 22 41 21 |.\"A!...|....\"A!|
|00004a80| 1e 0f d0 0e 07 21 1e 11 | 0e 12 1e 13 d4 1e 15 d4 |.....!..|........|
|00004a90| 1e 16 d4 1e 17 d4 1e 18 | 0e 19 89 5c 5c 16 15 0e |........|...\\...|
|00004aa0| 19 da 5f 16 16 0e 0d 0e | 16 5a 0e 1b 5a 16 17 0e |.._.....|.Z..Z...|
|00004ab0| 0f 0e 1c ab a0 0e 13 1e | 1d 0e 1e ab 8b df 0e 1d |........|........|
|00004ac0| 21 d0 0e 1d 21 a5 aa 84 | e0 0e 1d 21 29 0e 21 0e |!...!...|...!).!.|
|00004ad0| 15 5c 5c 5f aa bd 0e 11 | 0e 07 1e 1d 0e 1e ab 8b |.\\_....|........|
|00004ae0| df 0e 1d 21 d0 0e 1d 21 | a5 aa 84 e0 0e 1d 21 29 |...!...!|......!)|
|00004af0| 5f 0e 13 1e 1d 0e 1e ab | 8b df 0e 1d 21 d0 0e 1d |_.......|....!...|
|00004b00| 21 a5 aa 84 e0 0e 1d 21 | 29 0e 5c 22 0e 23 0e 15 |!......!|).\".#..|
|00004b10| 5c 5c 5c 5c 5f 5a 5c 5c | 16 18 0e 17 e4 5d 16 17 |\\\\_Z\\|.....]..|
|00004b20| 0e 18 e4 5d 16 18 0e 17 | e5 20 0e 26 89 5c 5c 0e |...]....|. .&.\\.|
|00004b30| 13 1e 1d 0e 1e ab 8b e7 | 0e 1d 21 e8 0e 1d 21 a5 |........|..!...!.|
|00004b40| aa 84 e9 0e 1d 21 29 5f | 5a 5e 16 17 0e 18 ea 20 |.....!)_|Z^..... |
|00004b50| 0e 5c 22 0e 13 1e 1d 0e | 1e ab 8b df 0e 1d 21 d0 |.\".....|......!.|
|00004b60| 0e 1d 21 a5 aa 84 e0 0e | 1d 21 29 5f 5a 5e 16 18 |..!.....|.!)_Z^..|
|00004b70| cc 0e 17 42 ce 0e 18 2e | 0b 42 44 aa 89 0e 2b ec |...B....|.BD...+.|
|00004b80| 3d ae 83 ed ee 21 29 87 | 22 20 5b 53 74 61 72 74 |=....!).|" [Start|
|00004b90| 42 75 66 66 65 72 20 63 | 74 6c 2d 62 75 66 66 65 |Buffer c|tl-buffe|
|00004ba0| 72 20 67 65 74 2d 62 75 | 66 66 65 72 20 62 75 66 |r get-bu|ffer buf|
|00004bb0| 66 65 72 2d 6e 61 6d 65 | 20 28 28 73 65 74 2d 62 |fer-name| ((set-b|
|00004bc0| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00004bd0| 72 29 29 20 77 69 6e 64 | 6f 77 2d 66 72 61 6d 65 |r)) wind|ow-frame|
|00004be0| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 2d 41 20 | ediff-w|indow-A |
|00004bf0| 66 72 61 6d 65 2d 41 20 | 66 72 61 6d 65 2d 70 61 |frame-A |frame-pa|
|00004c00| 72 61 6d 65 74 65 72 73 | 20 66 72 61 6d 65 2d 41 |rameters| frame-A|
|00004c10| 2d 70 61 72 61 6d 65 74 | 65 72 73 20 65 76 61 6c |-paramet|ers eval|
|00004c20| 20 61 73 73 6f 63 20 74 | 6f 70 20 66 72 61 6d 65 | assoc t|op frame|
|00004c30| 2d 41 2d 74 6f 70 20 6c | 65 66 74 20 66 72 61 6d |-A-top l|eft fram|
|00004c40| 65 2d 41 2d 6c 65 66 74 | 20 66 72 61 6d 65 2d 77 |e-A-left| frame-w|
|00004c50| 69 64 74 68 20 66 72 61 | 6d 65 2d 41 2d 77 69 64 |idth fra|me-A-wid|
|00004c60| 74 68 20 65 64 69 66 66 | 2d 63 6f 6e 74 72 6f 6c |th ediff|-control|
|00004c70| 2d 66 72 61 6d 65 20 63 | 74 6c 2d 66 72 61 6d 65 |-frame c|tl-frame|
|00004c80| 20 6e 69 6c 20 68 6f 72 | 69 7a 6f 6e 74 61 6c 2d | nil hor|izontal-|
|00004c90| 61 64 6a 75 73 74 6d 65 | 6e 74 20 75 70 77 61 72 |adjustme|nt upwar|
|00004ca0| 64 2d 61 64 6a 75 73 74 | 6d 65 6e 74 20 63 74 6c |d-adjust|ment ctl|
|00004cb0| 2d 66 72 61 6d 65 2d 74 | 6f 70 20 63 74 6c 2d 66 |-frame-t|op ctl-f|
|00004cc0| 72 61 6d 65 2d 6c 65 66 | 74 20 65 64 69 66 66 2d |rame-lef|t ediff-|
|00004cd0| 63 6f 6e 74 72 6f 6c 2d | 62 75 66 66 65 72 2d 6e |control-|buffer-n|
|00004ce0| 75 6d 62 65 72 20 2d 31 | 34 20 65 64 69 66 66 2d |umber -1|4 ediff-|
|00004cf0| 63 6f 6e 74 72 6f 6c 2d | 66 72 61 6d 65 2d 75 70 |control-|frame-up|
|00004d00| 77 61 72 64 2d 73 68 69 | 66 74 20 65 64 69 66 66 |ward-shi|ft ediff|
|00004d10| 2d 70 72 65 66 65 72 2d | 6c 6f 6e 67 2d 68 65 6c |-prefer-|long-hel|
|00004d20| 70 2d 6d 65 73 73 61 67 | 65 20 66 72 61 6d 65 20 |p-messag|e frame |
|00004d30| 65 64 69 66 66 2d 78 65 | 6d 61 63 73 2d 70 20 66 |ediff-xe|macs-p f|
|00004d40| 72 61 6d 65 2d 70 69 78 | 65 6c 2d 77 69 64 74 68 |rame-pix|el-width|
|00004d50| 20 66 72 61 6d 65 2d 63 | 68 61 72 2d 77 69 64 74 | frame-c|har-widt|
|00004d60| 68 20 65 64 69 66 66 2d | 77 69 64 65 2d 63 6f 6e |h ediff-|wide-con|
|00004d70| 74 72 6f 6c 2d 66 72 61 | 6d 65 2d 72 69 67 68 74 |trol-fra|me-right|
|00004d80| 77 61 72 64 2d 73 68 69 | 66 74 20 63 74 6c 2d 66 |ward-shi|ft ctl-f|
|00004d90| 72 61 6d 65 2d 77 69 64 | 74 68 20 65 64 69 66 66 |rame-wid|th ediff|
|00004da0| 2d 6e 61 72 72 6f 77 2d | 63 6f 6e 74 72 6f 6c 2d |-narrow-|control-|
|00004db0| 66 72 61 6d 65 2d 6c 65 | 66 74 77 61 72 64 2d 73 |frame-le|ftward-s|
|00004dc0| 68 69 66 74 20 31 20 65 | 64 69 66 66 2d 64 69 73 |hift 1 e|diff-dis|
|00004dd0| 70 6c 61 79 2d 70 69 78 | 65 6c 2d 68 65 69 67 68 |play-pix|el-heigh|
|00004de0| 74 20 63 74 6c 2d 66 72 | 61 6d 65 2d 68 65 69 67 |t ctl-fr|ame-heig|
|00004df0| 68 74 20 66 72 61 6d 65 | 2d 70 69 78 65 6c 2d 68 |ht frame|-pixel-h|
|00004e00| 65 69 67 68 74 20 66 72 | 61 6d 65 2d 68 65 69 67 |eight fr|ame-heig|
|00004e10| 68 74 20 66 72 61 6d 65 | 2d 63 68 61 72 2d 68 65 |ht frame|-char-he|
|00004e20| 69 67 68 74 20 65 64 69 | 66 66 2d 64 69 73 70 6c |ight edi|ff-displ|
|00004e30| 61 79 2d 70 69 78 65 6c | 2d 77 69 64 74 68 20 74 |ay-pixel|-width t|
|00004e40| 68 69 73 2d 63 6f 6d 6d | 61 6e 64 20 65 64 69 66 |his-comm|and edif|
|00004e50| 66 2d 71 75 69 74 20 65 | 72 72 6f 72 20 22 59 6f |f-quit e|rror "Yo|
|00004e60| 75 27 76 65 20 6b 69 6c | 6c 65 64 20 61 6e 20 65 |u've kil|led an e|
|00004e70| 73 73 65 6e 74 69 61 6c | 20 45 64 69 66 66 20 62 |ssential| Ediff b|
|00004e80| 75 66 66 65 72 2d 2d 2d | 50 6c 65 61 73 65 20 71 |uffer---|Please q|
|00004e90| 75 69 74 20 45 64 69 66 | 66 22 5d 20 36 5d 20 65 |uit Edif|f"] 6] e|
|00004ea0| 64 69 66 66 2d 78 65 6d | 61 63 73 2d 73 65 6c 65 |diff-xem|acs-sele|
|00004eb0| 63 74 2d 66 72 61 6d 65 | 2d 68 6f 6f 6b 20 23 5b |ct-frame|-hook #[|
|00004ec0| 6e 69 6c 20 22 c0 20 09 | 9a ad 87 5c 6e 3f ad 83 |nil ". .|...\n?..|
|00004ed0| c3 09 21 87 22 20 5b 73 | 65 6c 65 63 74 65 64 2d |..!." [s|elected-|
|00004ee0| 66 72 61 6d 65 20 65 64 | 69 66 66 2d 63 6f 6e 74 |frame ed|iff-cont|
|00004ef0| 72 6f 6c 2d 66 72 61 6d | 65 20 65 64 69 66 66 2d |rol-fram|e ediff-|
|00004f00| 70 72 65 66 65 72 2d 6c | 6f 6e 67 2d 68 65 6c 70 |prefer-l|ong-help|
|00004f10| 2d 6d 65 73 73 61 67 65 | 20 72 61 69 73 65 2d 66 |-message| raise-f|
|00004f20| 72 61 6d 65 5d 20 32 5d | 5d 20 32 29 0a 28 66 73 |rame] 2]|] 2).(fs|
|00004f30| 65 74 20 27 65 64 69 66 | 66 2d 6d 61 6b 65 2d 77 |et 'edif|f-make-w|
|00004f40| 69 64 65 2d 64 69 73 70 | 6c 61 79 20 23 5b 6e 69 |ide-disp|lay #[ni|
|00004f50| 6c 20 22 c0 c1 21 ac 84 | c2 c3 21 88 c4 0d 21 1e |l "..!..|..!...!.|
|00004f60| 06 c7 0e 06 21 1e 08 0e | 06 1e 09 0e 5c 6e ab 8b |....!...|....\n..|
|00004f70| cb 0e 09 21 cc 0e 09 21 | a5 aa 84 cd 0e 09 21 29 |...!...!|......!)|
|00004f80| 1e 0e c1 20 0e 0e a5 cf | 5a 1e 10 d1 d2 d3 d4 d1 |... ....|Z.......|
|00004f90| 0e 08 5c 22 41 21 5d 42 | d5 d4 d5 0e 08 5c 22 41 |..\"A!]B|.....\"A|
|00004fa0| 42 44 16 16 0e 06 16 17 | d8 0e 06 d1 0e 0e 42 d5 |BD......|......B.|
|00004fb0| 0e 10 42 44 5c 22 2c 87 | 22 20 5b 66 62 6f 75 6e |..BD\",.|" [fboun|
|00004fc0| 64 70 20 65 64 69 66 66 | 2d 64 69 73 70 6c 61 79 |dp ediff|-display|
|00004fd0| 2d 70 69 78 65 6c 2d 77 | 69 64 74 68 20 65 72 72 |-pixel-w|idth err|
|00004fe0| 6f 72 20 22 43 61 6e 27 | 74 20 64 65 74 65 72 6d |or "Can'|t determ|
|00004ff0| 69 6e 65 20 64 69 73 70 | 6c 61 79 20 77 69 64 74 |ine disp|lay widt|
|00005000| 68 2e 22 20 77 69 6e 64 | 6f 77 2d 66 72 61 6d 65 |h." wind|ow-frame|
|00005010| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 2d 41 20 | ediff-w|indow-A |
|00005020| 66 72 61 6d 65 2d 41 20 | 66 72 61 6d 65 2d 70 61 |frame-A |frame-pa|
|00005030| 72 61 6d 65 74 65 72 73 | 20 66 72 61 6d 65 2d 41 |rameters| frame-A|
|00005040| 2d 70 61 72 61 6d 73 20 | 66 72 61 6d 65 20 65 64 |-params |frame ed|
|00005050| 69 66 66 2d 78 65 6d 61 | 63 73 2d 70 20 66 72 61 |iff-xema|cs-p fra|
|00005060| 6d 65 2d 70 69 78 65 6c | 2d 77 69 64 74 68 20 66 |me-pixel|-width f|
|00005070| 72 61 6d 65 2d 77 69 64 | 74 68 20 66 72 61 6d 65 |rame-wid|th frame|
|00005080| 2d 63 68 61 72 2d 77 69 | 64 74 68 20 63 77 20 35 |-char-wi|dth cw 5|
|00005090| 20 77 64 20 6c 65 66 74 | 20 30 20 65 76 61 6c 20 | wd left| 0 eval |
|000050a0| 61 73 73 6f 63 20 77 69 | 64 74 68 20 65 64 69 66 |assoc wi|dth edif|
|000050b0| 66 2d 77 69 64 65 2d 64 | 69 73 70 6c 61 79 2d 6f |f-wide-d|isplay-o|
|000050c0| 72 69 67 2d 70 61 72 61 | 6d 65 74 65 72 73 20 65 |rig-para|meters e|
|000050d0| 64 69 66 66 2d 77 69 64 | 65 2d 64 69 73 70 6c 61 |diff-wid|e-displa|
|000050e0| 79 2d 66 72 61 6d 65 20 | 6d 6f 64 69 66 79 2d 66 |y-frame |modify-f|
|000050f0| 72 61 6d 65 2d 70 61 72 | 61 6d 65 74 65 72 73 5d |rame-par|ameters]|
|00005100| 20 36 20 22 5c 0a 43 6f | 6e 73 74 72 75 63 74 20 | 6 "\.Co|nstruct |
|00005110| 61 6e 20 61 6c 69 73 74 | 20 6f 66 20 70 61 72 61 |an alist| of para|
|00005120| 6d 65 74 65 72 73 20 66 | 6f 72 20 74 68 65 20 77 |meters f|or the w|
|00005130| 69 64 65 20 64 69 73 70 | 6c 61 79 2e 0a 53 61 76 |ide disp|lay..Sav|
|00005140| 65 73 20 74 68 65 20 6f | 6c 64 20 66 72 61 6d 65 |es the o|ld frame|
|00005150| 20 70 61 72 61 6d 65 74 | 65 72 73 20 69 6e 20 60 | paramet|ers in `|
|00005160| 65 64 69 66 66 2d 77 69 | 64 65 2d 64 69 73 70 6c |ediff-wi|de-displ|
|00005170| 61 79 2d 6f 72 69 67 2d | 70 61 72 61 6d 65 74 65 |ay-orig-|paramete|
|00005180| 72 73 27 2e 0a 54 68 65 | 20 66 72 61 6d 65 20 74 |rs'..The| frame t|
|00005190| 6f 20 62 65 20 72 65 73 | 69 7a 65 64 20 69 73 20 |o be res|ized is |
|000051a0| 6b 65 70 74 20 69 6e 20 | 60 65 64 69 66 66 2d 77 |kept in |`ediff-w|
|000051b0| 69 64 65 2d 64 69 73 70 | 6c 61 79 2d 66 72 61 6d |ide-disp|lay-fram|
|000051c0| 65 27 2e 0a 54 68 69 73 | 20 66 75 6e 63 74 69 6f |e'..This| functio|
|000051d0| 6e 20 6d 6f 64 69 66 69 | 65 73 20 6f 6e 6c 79 20 |n modifi|es only |
|000051e0| 74 68 65 20 6c 65 66 74 | 20 6d 61 72 67 69 6e 20 |the left| margin |
|000051f0| 61 6e 64 20 74 68 65 20 | 77 69 64 74 68 20 6f 66 |and the |width of|
|00005200| 20 74 68 65 20 64 69 73 | 70 6c 61 79 2e 0a 49 74 | the dis|play..It|
|00005210| 20 61 73 73 75 6d 65 73 | 20 74 68 61 74 20 69 74 | assumes| that it|
|00005220| 20 69 73 20 63 61 6c 6c | 65 64 20 66 72 6f 6d 20 | is call|ed from |
|00005230| 77 69 74 68 69 6e 20 74 | 68 65 20 63 6f 6e 74 72 |within t|he contr|
|00005240| 6f 6c 20 62 75 66 66 65 | 72 2e 22 5d 29 0a 28 62 |ol buffe|r."]).(b|
|00005250| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 4d 88 c2 c3 |yte-code| "..M...|
|00005260| 4d 88 c4 c5 4d 88 c6 c7 | 4d 88 c8 c9 4d 88 ca cb |M...M...|M...M...|
|00005270| 4d 88 cc cd 21 87 22 20 | 5b 65 64 69 66 66 2d 72 |M...!." |[ediff-r|
|00005280| 65 66 72 65 73 68 2d 6d | 6f 64 65 2d 6c 69 6e 65 |efresh-m|ode-line|
|00005290| 73 20 23 5b 6e 69 6c 20 | 22 c0 89 89 89 19 1a 1b |s #[nil |".......|
|000052a0| 1c c0 1d 0e 06 89 15 c7 | 59 ad 84 0d 0e 08 57 29 |........|Y.....W)|
|000052b0| 83 d8 00 0e 09 ad 9a ca | 0e 09 21 ad 94 cb ca 0e |........|..!.....|
|000052c0| 09 21 21 ad 8c cc cd ce | cf 5c 22 21 4a 0e 06 48 |.!!.....|.\"!J..H|
|000052d0| d0 48 12 0e 11 ad 87 0e | 11 0e 06 48 c7 48 11 0e |.H......|...H.H..|
|000052e0| 09 ad 9a ca 0e 09 21 ad | 94 cb ca 0e 09 21 21 ad |......!.|.....!!.|
|000052f0| 8c cc cd ce d2 5c 22 21 | 4a 0e 06 48 d0 48 14 0e |.....\"!|J..H.H..|
|00005300| 09 ad 9a ca 0e 09 21 ad | 94 cb ca 0e 09 21 21 ad |......!.|.....!!.|
|00005310| 8c cc cd ce d3 5c 22 21 | 4a 0e 06 48 d0 48 13 0c |.....\"!|J..H.H..|
|00005320| ab 86 cd d4 0c 5c 22 aa | 81 d5 14 0b ab 86 cd d4 |.....\".|........|
|00005330| 0b 5c 22 aa 81 d5 13 0e | 09 ab b7 ca 0e 09 21 ab |.\".....|......!.|
|00005340| b1 cb ca 0e 09 21 21 ab | a9 5c 6e ac 83 09 ab a3 |.....!!.|.\n.....|
|00005350| cd d6 5c 6e ae 81 d5 09 | ab 85 d7 09 50 aa 81 d5 |..\n....|....P...|
|00005360| 0e 11 ab 8c 0e 11 0e 06 | 48 d8 48 ab 83 d9 aa 81 |........|H.H.....|
|00005370| d5 24 aa 81 d5 12 aa 86 | d5 14 d5 13 d5 12 da 20 |.$......|....... |
|00005380| ab 8e 0e 1b ab 8a 0e 1c | 0e 1d 9a ab 83 de aa 81 |........|........|
|00005390| df 0e 20 e1 45 16 5c 22 | da 20 ab 90 0e 1b ab 8c |.. .E.\"|. ......|
|000053a0| 0e 1c 0e 1d 9a ab 85 e3 | e4 21 aa 82 e5 20 16 20 |........|.!... . |
|000053b0| e6 20 88 e7 20 ab 8f e7 | 20 e8 3e ac 89 e9 0e 2a |. .. ...| .>....*|
|000053c0| 21 ab 83 eb 20 88 70 1e | 2c 0e 2d ab b1 ca 0e 2d |!... .p.|,.-....-|
|000053d0| 21 ab ab cb ca 0e 2d 21 | 21 ab a3 ee 8e 0e 2d 71 |!.....-!|!.....-q|
|000053e0| 88 0c 16 2f 0e 5c 22 40 | f0 9d ab 86 f1 0e 5c 22 |.../.\"@|......\"|
|000053f0| 38 16 5c 22 f2 ef 0e 5c | 22 45 16 5c 22 e6 20 88 |8.\"...\|"E.\". .|
|00005400| 29 aa 8a 0e 33 f4 3d ac | 84 f5 f6 21 88 29 70 1e |)...3.=.|...!.)p.|
|00005410| 2c 0e 37 ab b1 ca 0e 37 | 21 ab ab cb ca 0e 37 21 |,.7....7|!.....7!|
|00005420| 21 ab a3 f8 8e 0e 37 71 | 88 0b 16 2f 0e 5c 22 40 |!.....7q|.../.\"@|
|00005430| f0 9d ab 86 f1 0e 5c 22 | 38 16 5c 22 f9 ef 0e 5c |......\"|8.\"...\|
|00005440| 22 45 16 5c 22 e6 20 88 | 29 aa 8a 0e 33 f4 3d ac |"E.\". .|)...3.=.|
|00005450| 84 f5 f6 21 88 29 0e 3a | ab c3 70 1e 2c 0e 09 ab |...!.).:|..p.,...|
|00005460| b1 ca 0e 09 21 ab ab cb | ca 0e 09 21 21 ab a3 fb |....!...|...!!...|
|00005470| 8e 0e 09 71 88 5c 6e 16 | 2f 0e 5c 22 40 f0 9d ab |...q.\n.|/.\"@...|
|00005480| 86 f1 0e 5c 22 38 16 5c | 22 fc ef 0e 5c 22 45 16 |...\"8.\|"...\"E.|
|00005490| 5c 22 e6 20 88 29 aa 8a | 0e 33 f4 3d ac 84 f5 f6 |\". .)..|.3.=....|
|000054a0| 21 88 29 0e 3d ad f0 ca | 0e 3d 21 ad ea cb ca 0e |!.).=...|.=!.....|
|000054b0| 3d 21 21 ad e2 70 1e 2c | 0e 3d ab d1 ca 0e 3d 21 |=!!..p.,|.=....=!|
|000054c0| ab cb cb ca 0e 3d 21 21 | ab c3 fe 8e 0e 3d 71 88 |.....=!!|.....=q.|
|000054d0| 0e 5c 22 40 f0 9d ab 86 | f1 0e 5c 22 38 16 5c 22 |.\"@....|..\"8.\"|
|000054e0| ff 09 3b ac 83 d5 aa 9f | 81 40 00 81 41 00 09 5c |..;.....|.@..A..\|
|000054f0| 22 ab 85 81 42 00 aa 90 | 81 40 00 81 43 00 09 5c |"...B...|.@..C..\|
|00005500| 22 ab 85 81 44 00 aa 81 | d5 0e 5c 22 45 89 16 5c |"...D...|..\"E..\|
|00005510| 22 29 aa 89 0e 33 f4 3d | ae 83 f5 f6 21 29 2c 87 |")...3.=|....!),.|
|00005520| 22 20 5b 6e 69 6c 20 62 | 75 66 2d 43 2d 73 74 61 |" [nil b|uf-C-sta|
|00005530| 74 65 2d 6d 65 72 67 65 | 20 62 75 66 2d 43 2d 73 |te-merge| buf-C-s|
|00005540| 74 61 74 65 2d 64 69 66 | 66 20 62 75 66 2d 42 2d |tate-dif|f buf-B-|
|00005550| 73 74 61 74 65 2d 64 69 | 66 66 20 62 75 66 2d 41 |state-di|ff buf-A|
|00005560| 2d 73 74 61 74 65 2d 64 | 69 66 66 20 6e 20 65 64 |-state-d|iff n ed|
|00005570| 69 66 66 2d 63 75 72 72 | 65 6e 74 2d 64 69 66 66 |iff-curr|ent-diff|
|00005580| 65 72 65 6e 63 65 20 30 | 20 65 64 69 66 66 2d 6e |erence 0| ediff-n|
|00005590| 75 6d 62 65 72 2d 6f 66 | 2d 64 69 66 66 65 72 65 |umber-of|-differe|
|000055a0| 6e 63 65 73 20 65 64 69 | 66 66 2d 62 75 66 66 65 |nces edi|ff-buffe|
|000055b0| 72 2d 43 20 67 65 74 2d | 62 75 66 66 65 72 20 62 |r-C get-|buffer b|
|000055c0| 75 66 66 65 72 2d 6e 61 | 6d 65 20 69 6e 74 65 72 |uffer-na|me inter|
|000055d0| 6e 20 66 6f 72 6d 61 74 | 20 22 65 64 69 66 66 2d |n format| "ediff-|
|000055e0| 64 69 66 66 65 72 65 6e | 63 65 2d 76 65 63 74 6f |differen|ce-vecto|
|000055f0| 72 2d 25 53 22 20 43 20 | 33 20 65 64 69 66 66 2d |r-%S" C |3 ediff-|
|00005600| 73 74 61 74 65 2d 6f 66 | 2d 6d 65 72 67 65 20 41 |state-of|-merge A|
|00005610| 20 42 20 22 5b 25 73 5d | 20 22 20 22 22 20 22 5b | B "[%s]| " "" "[|
|00005620| 25 73 25 73 25 73 5d 20 | 22 20 22 20 22 20 31 20 |%s%s%s] |" " " 1 |
|00005630| 22 20 41 6e 63 65 73 74 | 6f 72 45 6d 70 74 79 22 |" Ancest|orEmpty"|
|00005640| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 2d 64 69 | ediff-w|indow-di|
|00005650| 73 70 6c 61 79 2d 70 20 | 65 64 69 66 66 2d 6d 75 |splay-p |ediff-mu|
|00005660| 6c 74 69 66 72 61 6d 65 | 20 65 64 69 66 66 2d 68 |ltiframe| ediff-h|
|00005670| 65 6c 70 2d 6d 65 73 73 | 61 67 65 20 65 64 69 66 |elp-mess|age edif|
|00005680| 66 2d 62 72 69 65 66 2d | 6d 65 73 73 61 67 65 2d |f-brief-|message-|
|00005690| 73 74 72 69 6e 67 20 22 | 20 20 20 22 20 22 2d 2d |string "|   " "--|
|000056a0| 20 22 20 6d 6f 64 65 2d | 6c 69 6e 65 2d 62 75 66 | " mode-|line-buf|
|000056b0| 66 65 72 2d 69 64 65 6e | 74 69 66 69 63 61 74 69 |fer-iden|tificati|
|000056c0| 6f 6e 20 22 20 20 20 20 | 20 20 20 20 20 20 20 20 |on "    |        |
|000056d0| 20 20 20 48 6f 77 64 79 | 21 22 20 6d 6f 64 65 2d |   Howdy|!" mode-|
|000056e0| 6c 69 6e 65 2d 66 6f 72 | 6d 61 74 20 65 64 69 66 |line-for|mat edif|
|000056f0| 66 2d 6d 61 6b 65 2d 6e | 61 72 72 6f 77 2d 63 6f |f-make-n|arrow-co|
|00005700| 6e 74 72 6f 6c 2d 62 75 | 66 66 65 72 2d 69 64 20 |ntrol-bu|ffer-id |
|00005710| 73 6b 69 70 2d 6e 61 6d | 65 20 65 64 69 66 66 2d |skip-nam|e ediff-|
|00005720| 6d 61 6b 65 2d 77 69 64 | 65 2d 63 6f 6e 74 72 6f |make-wid|e-contro|
|00005730| 6c 2d 62 75 66 66 65 72 | 2d 69 64 20 66 6f 72 63 |l-buffer|-id forc|
|00005740| 65 2d 6d 6f 64 65 2d 6c | 69 6e 65 2d 75 70 64 61 |e-mode-l|ine-upda|
|00005750| 74 65 20 65 64 69 66 66 | 2d 64 65 76 69 63 65 2d |te ediff|-device-|
|00005760| 74 79 70 65 20 28 74 74 | 79 20 73 74 72 65 61 6d |type (tt|y stream|
|00005770| 29 20 66 72 61 6d 65 2d | 6c 69 76 65 2d 70 20 65 |) frame-|live-p e|
|00005780| 64 69 66 66 2d 63 6f 6e | 74 72 6f 6c 2d 66 72 61 |diff-con|trol-fra|
|00005790| 6d 65 20 65 64 69 66 66 | 2d 72 65 66 72 65 73 68 |me ediff|-refresh|
|000057a0| 2d 63 6f 6e 74 72 6f 6c | 2d 66 72 61 6d 65 20 53 |-control|-frame S|
|000057b0| 74 61 72 74 42 75 66 66 | 65 72 20 65 64 69 66 66 |tartBuff|er ediff|
|000057c0| 2d 62 75 66 66 65 72 2d | 41 20 28 28 73 65 74 2d |-buffer-|A ((set-|
|000057d0| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|000057e0| 65 72 29 29 20 65 64 69 | 66 66 2d 64 69 66 66 2d |er)) edi|ff-diff-|
|000057f0| 73 74 61 74 75 73 20 28 | 22 20 41 3a 20 22 20 22 |status (|" A: " "|
|00005800| 20 42 3a 20 22 20 22 20 | 43 3a 20 22 20 22 20 41 | B: " " |C: " " A|
|00005810| 6e 63 65 73 74 6f 72 3a | 20 22 29 20 32 20 22 20 |ncestor:| ") 2 " |
|00005820| 41 3a 20 22 20 74 68 69 | 73 2d 63 6f 6d 6d 61 6e |A: " thi|s-comman|
|00005830| 64 20 65 64 69 66 66 2d | 71 75 69 74 20 65 72 72 |d ediff-|quit err|
|00005840| 6f 72 20 22 59 6f 75 27 | 76 65 20 6b 69 6c 6c 65 |or "You'|ve kille|
|00005850| 64 20 61 6e 20 65 73 73 | 65 6e 74 69 61 6c 20 45 |d an ess|ential E|
|00005860| 64 69 66 66 20 62 75 66 | 66 65 72 2d 2d 2d 50 6c |diff buf|fer---Pl|
|00005870| 65 61 73 65 20 71 75 69 | 74 20 45 64 69 66 66 22 |ease qui|t Ediff"|
|00005880| 20 65 64 69 66 66 2d 62 | 75 66 66 65 72 2d 42 20 | ediff-b|uffer-B |
|00005890| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|000058a0| 72 74 42 75 66 66 65 72 | 29 29 20 22 20 42 3a 20 |rtBuffer|)) " B: |
|000058b0| 22 20 65 64 69 66 66 2d | 33 77 61 79 2d 6a 6f 62 |" ediff-|3way-job|
|000058c0| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|000058d0| 61 72 74 42 75 66 66 65 | 72 29 29 20 22 20 43 3a |artBuffe|r)) " C:|
|000058e0| 20 22 20 65 64 69 66 66 | 2d 61 6e 63 65 73 74 6f | " ediff|-ancesto|
|000058f0| 72 2d 62 75 66 66 65 72 | 20 28 28 73 65 74 2d 62 |r-buffer| ((set-b|
|00005900| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00005910| 72 29 29 20 22 20 41 6e | 63 65 73 74 6f 72 3a 20 |r)) " An|cestor: |
|00005920| 22 20 73 74 72 69 6e 67 | 2d 6d 61 74 63 68 20 22 |" string|-match "|
|00005930| 70 72 65 66 65 72 2d 41 | 22 20 22 5b 3d 64 69 66 |prefer-A|" "[=dif|
|00005940| 66 28 42 29 5d 20 22 20 | 22 70 72 65 66 65 72 2d |f(B)] " |"prefer-|
|00005950| 42 22 20 22 5b 3d 64 69 | 66 66 28 41 29 5d 20 22 |B" "[=di|ff(A)] "|
|00005960| 5d 20 37 5d 20 65 64 69 | 66 66 2d 72 65 66 72 65 |] 7] edi|ff-refre|
|00005970| 73 68 2d 63 6f 6e 74 72 | 6f 6c 2d 66 72 61 6d 65 |sh-contr|ol-frame|
|00005980| 20 23 5b 6e 69 6c 20 22 | c0 20 11 c0 20 12 c0 20 | #[nil "|. .. .. |
|00005990| 13 0c ab 8a c5 0e 06 c7 | c0 20 42 43 5c 22 87 c5 |........|. BC\"..|
|000059a0| 0e 06 c8 5c 22 87 22 20 | 5b 65 64 69 66 66 2d 6d |...\"." |[ediff-m|
|000059b0| 61 6b 65 2d 6e 61 72 72 | 6f 77 2d 63 6f 6e 74 72 |ake-narr|ow-contr|
|000059c0| 6f 6c 2d 62 75 66 66 65 | 72 2d 69 64 20 66 72 61 |ol-buffe|r-id fra|
|000059d0| 6d 65 2d 74 69 74 6c 65 | 2d 66 6f 72 6d 61 74 20 |me-title|-format |
|000059e0| 66 72 61 6d 65 2d 69 63 | 6f 6e 2d 74 69 74 6c 65 |frame-ic|on-title|
|000059f0| 2d 66 6f 72 6d 61 74 20 | 69 63 6f 6e 2d 74 69 74 |-format |icon-tit|
|00005a00| 6c 65 2d 66 6f 72 6d 61 | 74 20 65 64 69 66 66 2d |le-forma|t ediff-|
|00005a10| 65 6d 61 63 73 2d 70 20 | 6d 6f 64 69 66 79 2d 66 |emacs-p |modify-f|
|00005a20| 72 61 6d 65 2d 70 61 72 | 61 6d 65 74 65 72 73 20 |rame-par|ameters |
|00005a30| 65 64 69 66 66 2d 63 6f | 6e 74 72 6f 6c 2d 66 72 |ediff-co|ntrol-fr|
|00005a40| 61 6d 65 20 6e 61 6d 65 | 20 28 6e 69 6c 29 5d 20 |ame name| (nil)] |
|00005a50| 34 5d 20 65 64 69 66 66 | 2d 6d 61 6b 65 2d 6e 61 |4] ediff|-make-na|
|00005a60| 72 72 6f 77 2d 63 6f 6e | 74 72 6f 6c 2d 62 75 66 |rrow-con|trol-buf|
|00005a70| 66 65 72 2d 69 64 20 23 | 5b 28 26 6f 70 74 69 6f |fer-id #|[(&optio|
|00005a80| 6e 61 6c 20 73 6b 69 70 | 2d 6e 61 6d 65 29 20 22 |nal skip|-name) "|
|00005a90| 08 ab 83 c1 aa 87 c2 c3 | 0c 5c 22 41 0d 50 0e 06 |........|.\"A.P..|
|00005aa0| c7 57 ab 87 c8 c9 0e 5c | 6e 5c 22 aa 96 0e 06 0e |.W.....\|n\".....|
|00005ab0| 5c 6e 59 ab 87 c8 cb 0e | 5c 6e 5c 22 aa 88 c8 cc |\nY.....|\n\"....|
|00005ac0| 0e 06 54 0e 5c 6e 23 50 | 87 22 20 5b 73 6b 69 70 |..T.\n#P|." [skip|
|00005ad0| 2d 6e 61 6d 65 20 22 20 | 22 20 61 73 73 6f 63 20 |-name " |" assoc |
|00005ae0| 6e 61 6d 65 20 65 64 69 | 66 66 2d 63 6f 6e 74 72 |name edi|ff-contr|
|00005af0| 6f 6c 2d 66 72 61 6d 65 | 2d 70 61 72 61 6d 65 74 |ol-frame|-paramet|
|00005b00| 65 72 73 20 65 64 69 66 | 66 2d 63 6f 6e 74 72 6f |ers edif|f-contro|
|00005b10| 6c 2d 62 75 66 66 65 72 | 2d 73 75 66 66 69 78 20 |l-buffer|-suffix |
|00005b20| 65 64 69 66 66 2d 63 75 | 72 72 65 6e 74 2d 64 69 |ediff-cu|rrent-di|
|00005b30| 66 66 65 72 65 6e 63 65 | 20 30 20 66 6f 72 6d 61 |fference| 0 forma|
|00005b40| 74 20 22 20 5f 2f 25 64 | 22 20 65 64 69 66 66 2d |t " _/%d|" ediff-|
|00005b50| 6e 75 6d 62 65 72 2d 6f | 66 2d 64 69 66 66 65 72 |number-o|f-differ|
|00005b60| 65 6e 63 65 73 20 22 20 | 24 2f 25 64 22 20 22 20 |ences " |$/%d" " |
|00005b70| 25 64 2f 25 64 22 5d 20 | 35 5d 20 65 64 69 66 66 |%d/%d"] |5] ediff|
|00005b80| 2d 6d 61 6b 65 2d 77 69 | 64 65 2d 63 6f 6e 74 72 |-make-wi|de-contr|
|00005b90| 6f 6c 2d 62 75 66 66 65 | 72 2d 69 64 20 23 5b 6e |ol-buffe|r-id #[n|
|00005ba0| 69 6c 20 22 08 c1 57 ab | 86 c2 c3 0c 5c 22 43 87 |il "..W.|....\"C.|
|00005bb0| 08 0c 59 ab 86 c2 c5 0c | 5c 22 43 87 c2 c6 08 54 |..Y.....|\"C....T|
|00005bc0| 0c 23 43 87 22 20 5b 65 | 64 69 66 66 2d 63 75 72 |.#C." [e|diff-cur|
|00005bd0| 72 65 6e 74 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |rent-dif|ference |
|00005be0| 30 20 66 6f 72 6d 61 74 | 20 22 25 25 62 20 20 20 |0 format| "%%b   |
|00005bf0| 41 74 20 73 74 61 72 74 | 20 6f 66 20 25 64 20 64 |At start| of %d d|
|00005c00| 69 66 66 73 22 20 65 64 | 69 66 66 2d 6e 75 6d 62 |iffs" ed|iff-numb|
|00005c10| 65 72 2d 6f 66 2d 64 69 | 66 66 65 72 65 6e 63 65 |er-of-di|fference|
|00005c20| 73 20 22 25 25 62 20 20 | 20 41 74 20 65 6e 64 20 |s "%%b  | At end |
|00005c30| 6f 66 20 25 64 20 64 69 | 66 66 73 22 20 22 25 25 |of %d di|ffs" "%%|
|00005c40| 62 20 20 20 64 69 66 66 | 20 25 64 20 6f 66 20 25 |b   diff| %d of %|
|00005c50| 64 22 5d 20 34 5d 20 65 | 64 69 66 66 2d 67 65 74 |d"] 4] e|diff-get|
|00005c60| 2d 76 69 73 69 62 6c 65 | 2d 62 75 66 66 65 72 2d |-visible|-buffer-|
|00005c70| 77 69 6e 64 6f 77 20 23 | 5b 28 62 75 66 66 29 20 |window #|[(buff) |
|00005c80| 22 08 ad 98 c1 08 21 ad | 93 c2 c1 08 21 21 ad 8c |".....!.|....!!..|
|00005c90| 0b ab 85 c4 08 c5 5c 22 | 87 c4 08 c6 5c 22 87 22 |......\"|....\"."|
|00005ca0| 20 5b 62 75 66 66 20 67 | 65 74 2d 62 75 66 66 65 | [buff g|et-buffe|
|00005cb0| 72 20 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 65 64 |r buffer|-name ed|
|00005cc0| 69 66 66 2d 78 65 6d 61 | 63 73 2d 70 20 67 65 74 |iff-xema|cs-p get|
|00005cd0| 2d 62 75 66 66 65 72 2d | 77 69 6e 64 6f 77 20 74 |-buffer-|window t|
|00005ce0| 20 76 69 73 69 62 6c 65 | 5d 20 33 5d 20 65 64 69 | visible|] 3] edi|
|00005cf0| 66 66 2d 6b 65 65 70 2d | 77 69 6e 64 6f 77 2d 63 |ff-keep-|window-c|
|00005d00| 6f 6e 66 69 67 20 23 5b | 28 63 6f 6e 74 72 6f 6c |onfig #[|(control|
|00005d10| 2d 62 75 66 29 20 22 08 | 70 3d 85 c8 00 c1 20 c2 |-buf) ".|p=.... .|
|00005d20| 55 3f 85 c8 00 70 1b 08 | 83 be 00 c4 08 21 83 be |U?...p..|.....!..|
|00005d30| 00 c5 c4 08 21 21 83 be | 00 c6 8e 08 71 88 0e 07 |....!!..|....q...|
|00005d40| 0e 08 0e 09 0e 5c 6e 1e | 0b 1e 0c 1e 0d 1e 0e 0e |.....\n.|........|
|00005d50| 0d 1e 0f d0 0e 0f 21 ad | 8b d1 20 3f ae 86 d2 d3 |......!.|.. ?....|
|00005d60| 0e 0f 21 21 29 ad ec 0e | 0c 1e 0f d0 0e 0f 21 ad |..!!)...|......!.|
|00005d70| 8b d1 20 3f ae 86 d2 d3 | 0e 0f 21 21 29 ad d4 0e |.. ?....|..!!)...|
|00005d80| 14 ab 98 0e 0b 1e 0f d0 | 0e 0f 21 ad 8b d1 20 3f |........|..!... ?|
|00005d90| ae 86 d2 d3 0e 0f 21 21 | 29 ad b8 d5 0e 0d 21 0e |......!!|).....!.|
|00005da0| 16 3d ad af d5 0e 0c 21 | 0e 17 3d ad a6 0e 14 ab |.=.....!|..=.....|
|00005db0| 89 d5 0e 0b 21 0e 18 3d | ad 99 0e 19 da db 0e 0e |....!..=|........|
|00005dc0| 0e 0d 0e 0c 0e 0b 0e 1c | d1 20 ad 82 0e 1d 0e 1e |........|. ......|
|00005dd0| 26 08 98 2d aa 89 0e 1f | e0 3d ae 83 e1 e2 21 29 |&..-....|.=....!)|
|00005de0| 87 22 20 5b 63 6f 6e 74 | 72 6f 6c 2d 62 75 66 20 |." [cont|rol-buf |
|00005df0| 62 75 66 66 65 72 2d 73 | 69 7a 65 20 30 20 53 74 |buffer-s|ize 0 St|
|00005e00| 61 72 74 42 75 66 66 65 | 72 20 67 65 74 2d 62 75 |artBuffe|r get-bu|
|00005e10| 66 66 65 72 20 62 75 66 | 66 65 72 2d 6e 61 6d 65 |ffer buf|fer-name|
|00005e20| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|00005e30| 61 72 74 42 75 66 66 65 | 72 29 29 20 65 64 69 66 |artBuffe|r)) edif|
|00005e40| 66 2d 63 6f 6e 74 72 6f | 6c 2d 77 69 6e 64 6f 77 |f-contro|l-window|
|00005e50| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 2d 41 20 | ediff-w|indow-A |
|00005e60| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 2d 42 20 65 |ediff-wi|ndow-B e|
|00005e70| 64 69 66 66 2d 77 69 6e | 64 6f 77 2d 43 20 43 2d |diff-win|dow-C C-|
|00005e80| 77 69 6e 64 20 42 2d 77 | 69 6e 64 20 41 2d 77 69 |wind B-w|ind A-wi|
|00005e90| 6e 64 20 63 74 6c 2d 77 | 69 6e 64 20 77 69 6e 64 |nd ctl-w|ind wind|
|00005ea0| 20 77 69 6e 64 6f 77 2d | 6c 69 76 65 2d 70 20 65 | window-|live-p e|
|00005eb0| 64 69 66 66 2d 77 69 6e | 64 6f 77 2d 64 69 73 70 |diff-win|dow-disp|
|00005ec0| 6c 61 79 2d 70 20 66 72 | 61 6d 65 2d 76 69 73 69 |lay-p fr|ame-visi|
|00005ed0| 62 6c 65 2d 70 20 77 69 | 6e 64 6f 77 2d 66 72 61 |ble-p wi|ndow-fra|
|00005ee0| 6d 65 20 65 64 69 66 66 | 2d 33 77 61 79 2d 6a 6f |me ediff|-3way-jo|
|00005ef0| 62 20 77 69 6e 64 6f 77 | 2d 62 75 66 66 65 72 20 |b window|-buffer |
|00005f00| 65 64 69 66 66 2d 62 75 | 66 66 65 72 2d 41 20 65 |ediff-bu|ffer-A e|
|00005f10| 64 69 66 66 2d 62 75 66 | 66 65 72 2d 42 20 65 64 |diff-buf|fer-B ed|
|00005f20| 69 66 66 2d 62 75 66 66 | 65 72 2d 43 20 65 64 69 |iff-buff|er-C edi|
|00005f30| 66 66 2d 77 69 6e 64 6f | 77 2d 63 6f 6e 66 69 67 |ff-windo|w-config|
|00005f40| 2d 73 61 76 65 64 20 66 | 6f 72 6d 61 74 20 22 25 |-saved f|ormat "%|
|00005f50| 53 25 53 25 53 25 53 25 | 53 25 53 25 53 22 20 65 |S%S%S%S%|S%S%S" e|
|00005f60| 64 69 66 66 2d 73 70 6c | 69 74 2d 77 69 6e 64 6f |diff-spl|it-windo|
|00005f70| 77 2d 66 75 6e 63 74 69 | 6f 6e 20 65 64 69 66 66 |w-functi|on ediff|
|00005f80| 2d 6d 75 6c 74 69 66 72 | 61 6d 65 20 65 64 69 66 |-multifr|ame edif|
|00005f90| 66 2d 77 69 64 65 2d 64 | 69 73 70 6c 61 79 2d 70 |f-wide-d|isplay-p|
|00005fa0| 20 74 68 69 73 2d 63 6f | 6d 6d 61 6e 64 20 65 64 | this-co|mmand ed|
|00005fb0| 69 66 66 2d 71 75 69 74 | 20 65 72 72 6f 72 20 22 |iff-quit| error "|
|00005fc0| 59 6f 75 27 76 65 20 6b | 69 6c 6c 65 64 20 61 6e |You've k|illed an|
|00005fd0| 20 65 73 73 65 6e 74 69 | 61 6c 20 45 64 69 66 66 | essenti|al Ediff|
|00005fe0| 20 62 75 66 66 65 72 2d | 2d 2d 50 6c 65 61 73 65 | buffer-|--Please|
|00005ff0| 20 71 75 69 74 20 45 64 | 69 66 66 22 5d 20 31 30 | quit Ed|iff"] 10|
|00006000| 5d 20 70 72 6f 76 69 64 | 65 20 65 64 69 66 66 2d |] provid|e ediff-|
|00006010| 77 69 6e 64 5d 20 32 29 | 0a                      |wind] 2)|.       |
+--------+-------------------------+-------------------------+--------+--------+